diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 1983c9a5559f0b42c55d88b7f23abad075b36b38..7358c0824ed2433ad0c370f24eadfdd192f5abf9 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1167,6 +1167,10 @@ function image_setup_utils {
     if [[ $ARCHITECTURE == *"arm"* ]]; then
         GOARCH=armv6l
     fi
+    if [ ! $GOARCH ]; then
+        echo $'System architecture was not specified when installing Go'
+        exit 6734378
+    fi
     GO_SOURCE=https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GOARCH}.tar.gz
 
     if [ ! -d ${rootdir}/root/build ]; then
diff --git a/src/freedombone-utils-go b/src/freedombone-utils-go
index b395fe1032806bbea842181f33f696c213b40859..df438bddb71b199b4072a94428402836787ba5f0 100755
--- a/src/freedombone-utils-go
+++ b/src/freedombone-utils-go
@@ -163,6 +163,11 @@ function mesh_upgrade_golang {
             echo $"Using $GOARCH"
         fi
     fi
+    if [ ! $GOARCH ]; then
+        echo $'System architecture was not detected when installing Go'
+        echo "uname reports: $(uname -m)"
+        exit 63945284
+    fi
     GO_SOURCE=https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GOARCH}.tar.gz
 
     if [ ! -d ${rootdir}${INSTALL_DIR} ]; then