diff --git a/elements/rhel-common/finalise.d/99-unregister b/elements/rhel-common/finalise.d/60-unregister
similarity index 100%
rename from elements/rhel-common/finalise.d/99-unregister
rename to elements/rhel-common/finalise.d/60-unregister
diff --git a/elements/rhel7/root.d/10-rhel7-cloud-image b/elements/rhel7/root.d/10-rhel7-cloud-image
index 55d39274b..be38caa45 100755
--- a/elements/rhel7/root.d/10-rhel7-cloud-image
+++ b/elements/rhel7/root.d/10-rhel7-cloud-image
@@ -26,7 +26,7 @@ if [ -n "$DIB_LOCAL_IMAGE" ]; then
     BASE_IMAGE_FILE=`basename $DIB_LOCAL_IMAGE`
     BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz
 else
-    if [ -z "${BASE_IMAGE_FILE:-}" -o -z "${DIB_CLOUD_IMAGES}" ]; then
+    if [ -z "${BASE_IMAGE_FILE:-}" -o -z "${DIB_CLOUD_IMAGES:-}" ]; then
         echo "No source for a base image file configured."
         echo "See rhel7 element readme for details on how to obtain and use a base image."
         exit 1