diff --git a/packages/base/all/vendor-config-onl/src/bin/onlfit b/packages/base/all/vendor-config-onl/src/bin/onlfit
index 2b5ac815..657cbef4 100755
--- a/packages/base/all/vendor-config-onl/src/bin/onlfit
+++ b/packages/base/all/vendor-config-onl/src/bin/onlfit
@@ -5,9 +5,28 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
+ARCH=`uname -m`
+case $ARCH in
+    armv7l|ppc)
+    ;;
+    *)
+    echo "This script cannot be used on $ARCH platforms."
+    exit 1
+    ;;
+esac
+
 PLATFORM=$(cat /etc/onl/platform)
 
 dir=`mktemp -d`
-(cd $dir && wget $1)
-onlfs rw boot mv $dir/* /mnt/onl/boot/${PLATFORM}.itb
+rc=
+
+if (cd $dir && wget $1); then
+    onlfs rw boot mv $dir/* /mnt/onl/boot/${PLATFORM}.itb
+    rc=0
+else
+    echo "Download failed."
+    rc=1
+fi
+
 rmdir $dir
+exit $rc
diff --git a/packages/base/all/vendor-config-onl/src/bin/onlkernel b/packages/base/all/vendor-config-onl/src/bin/onlkernel
index 051a1729..e77a6cc5 100755
--- a/packages/base/all/vendor-config-onl/src/bin/onlkernel
+++ b/packages/base/all/vendor-config-onl/src/bin/onlkernel
@@ -5,7 +5,26 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
+ARCH=`uname -m`
+case $ARCH in
+    x86_64)
+    ;;
+    *)
+    echo "This script cannot be used on $ARCH platforms."
+    exit 1
+    ;;
+esac
+
 dir=`mktemp -d`
-(cd $dir && wget $1)
-onlfs rw boot mv $dir/* /mnt/onl/boot
+rc=
+
+if (cd $dir && wget $1); then
+    onlfs rw boot mv $dir/* /mnt/onl/boot
+    rc=0
+else
+    echo "Download failed."
+    rc=1
+fi
+
 rmdir $dir
+exit $rc