diff --git a/contrib/create-basic-configdrive b/contrib/create-basic-configdrive
index f3eb033483..5f9c4a58c8 100755
--- a/contrib/create-basic-configdrive
+++ b/contrib/create-basic-configdrive
@@ -171,10 +171,15 @@ CLOUD_CONFIG="${CLOUD_CONFIG/<HOSTNAME>/${HNAME}}"
 
 echo "$CLOUD_CONFIG" > "$CONFIG_FILE"
 
-mkisofs -R -V config-2 -o $CONFIGDRIVE_FILE $WORKDIR
-
-echo
-echo
-echo "Success! The config-drive image was created on ${CONFIGDRIVE_FILE}"
+mkisofs -R -V config-2 -o "$CONFIGDRIVE_FILE" "$WORKDIR"
 
+if [ "$?" -eq 0 ] ; then
+    echo
+    echo
+    echo "Success! The config-drive image was created on ${CONFIGDRIVE_FILE}"
+else
+    echo
+    echo
+    echo "Failure! The config-drive image was not created on ${CONFIGDRIVE_FILE}"
+fi
 # vim: ts=4 et