diff --git a/v0.2.1/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh b/v0.2.1/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
index e3e9428..6dc7710 100755
--- a/v0.2.1/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
+++ b/v0.2.1/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
@@ -228,7 +228,7 @@ function find_harddisk()
 	if [ -z "$dev" ] ; then
 		echo "no valid harddisk for initialisation found!" >>"$LOG_FILE"
 		cat /proc/partitions >>"$LOG_FILE"
-		return 1
+		# error handling will be done by the caller
 	fi
 	echo -n "$dev"
 }
@@ -305,7 +305,7 @@ function init_cryptobox_part1()
 		log_msg "Initializing crypto partition on $device ..."
 		umount_crypto || true
 		mount | grep -q " $CONFIG_DIR " && umount "$CONFIG_DIR" || true
-		initial_checks "$device" || { log_msg "initial checks failed" && return 1}
+		initial_checks "$device" || { log_msg "initial checks failed" && return 1; }
 		create_partitions "$device"
 		create_config "$device"
 	) >>"$LOG_FILE" 2>&1