diff --git a/src/freedombone-prep b/src/freedombone-prep
index 96c40150..c97e9d6d 100755
--- a/src/freedombone-prep
+++ b/src/freedombone-prep
@@ -161,10 +161,6 @@ if [ -f /usr/bin/sudo ]; then
     SUDO='sudo'
 fi
 $SUDO ./setup_sdcard.sh --mmc $MICROSD_DRIVE --dtb beaglebone
-if [ ! "$?" = "0" ]; then
-    echo 'System did not install to the microSD'
-    exit 4378
-fi
 
 echo ''
 echo ''
@@ -192,6 +188,12 @@ if [ ! -d $MICROSD_MOUNT_POINT/$ROOTFS ]; then
     exit 65688
 fi
 
+if [ ! -d $MICROSD_MOUNT_POINT/$ROOTFS/home ]; then
+    echo "The rootfs partition was not written correctly."
+    ls $MICROSD_MOUNT_POINT/$ROOTFS
+    exit 65688
+fi
+
 $SUDO cp $MICROSD_MOUNT_POINT/$BOOT/bbb-uEnv.txt $MICROSD_MOUNT_POINT/$BOOT/uEnv.txt
 
 $SUDO sed -i 's/iface eth0 inet dhcp/iface eth0 inet static/g' $MICROSD_MOUNT_POINT/$ROOTFS/etc/network/interfaces