--- a/mobile/android/base/GeckoProfile.java
+++ b/mobile/android/base/GeckoProfile.java
@@ -224,27 +224,27 @@ public final class GeckoProfile {
         }
         for (File f : files) {
             File target = new File(dst, f.getName());
             try {
                 if (f.renameTo(target)) {
                     continue;
                 }
             } catch (SecurityException se) {
-                Log.e(LOGTAG, "Unable to rename file to " + target.getAbsolutePath() + " while moving profiles", se);
+                Log.w(LOGTAG, "Unable to rename file to " + target.getAbsolutePath() + " while moving profiles", se);
             }
             // rename failed, try moving manually
             if (f.isDirectory()) {
-                if (target.mkdirs()) {
+                if (target.exists() || target.mkdirs()) {
                     moveDirContents(f, target);
                 } else {
                     Log.e(LOGTAG, "Unable to create folder " + target.getAbsolutePath() + " while moving profiles");
                 }
             } else {
-                if (! moveFile(f, target)) {
+                if (!moveFile(f, target)) {
                     Log.e(LOGTAG, "Unable to move file " + target.getAbsolutePath() + " while moving profiles");
                 }
             }
         }
         src.delete();
     }
 
     private boolean moveFile(File src, File dst) {