diff --git a/ccollect.sh b/ccollect.sh
index 1e4312f..f21e430 100755
--- a/ccollect.sh
+++ b/ccollect.sh
@@ -192,7 +192,7 @@ while [ "$i" -lt "$no_sources" ]; do
    #
    # Get current source
    #
-   eval name=\$source_${i}
+   eval name=\"\$source_${i}\"
    i=$(($i+1))
 
    export name
@@ -269,11 +269,11 @@ while [ "$i" -lt "$no_sources" ]; do
    if [ -x "$c_pre_exec" ]; then
       echo "Executing ${c_pre_exec} ..."
       "$c_pre_exec"
-      ret=$?
+      ret="$?"
       echo "Finished ${c_pre_exec}."
 
-      if [ $ret -ne 0 ]; then
-         echo "$c_pre_exec failed, aborting backup."
+      if [ "$ret" -ne 0 ]; then
+         echo "$c_pre_exec failed. Skipping"
          exit 1
       fi
    fi
diff --git a/conf/sources/testsource1/destination b/conf/sources/source with spaces/destination
similarity index 100%
rename from conf/sources/testsource1/destination
rename to conf/sources/source with spaces/destination
diff --git a/conf/sources/testsource1/exclude b/conf/sources/source with spaces/exclude
similarity index 100%
rename from conf/sources/testsource1/exclude
rename to conf/sources/source with spaces/exclude
diff --git a/conf/sources/testsource1/intervalls/daily b/conf/sources/source with spaces/intervalls/daily
similarity index 100%
rename from conf/sources/testsource1/intervalls/daily
rename to conf/sources/source with spaces/intervalls/daily
diff --git a/conf/sources/testsource1/source b/conf/sources/source with spaces/source
similarity index 100%
rename from conf/sources/testsource1/source
rename to conf/sources/source with spaces/source
diff --git a/conf/sources/testsource1/verbose b/conf/sources/source with spaces/verbose
similarity index 100%
rename from conf/sources/testsource1/verbose
rename to conf/sources/source with spaces/verbose