Index: /locker/deploy/bin/onathena
===================================================================
--- /locker/deploy/bin/onathena	(revision 1040)
+++ /locker/deploy/bin/onathena	(revision 1041)
@@ -222,7 +222,9 @@
 files=`athrun scripts gfind . -mindepth 1 -maxdepth 1 | grep -v .admin`
 numfiles=`echo "$files" | wc -l`
-if [ "$numfiles" -eq 1 ]; then
-    athrun scripts gfind . -mindepth 2 -maxdepth 2 | xargs -i mv \{} .
-    rmdir "$files"
+if [ ! -z "$files" ]; then
+    if [ "$numfiles" -eq 1 ]; then
+        athrun scripts gfind . -mindepth 2 -maxdepth 2 | xargs -i mv \{} .
+        rmdir "$files"
+    fi
 fi
 if [ -f "/mit/scripts/deploy$scriptsdev/php.ini/$deploy" ]; then