diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index bbe49ec0..327745e4 100644
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -124,14 +124,15 @@ switch ($serendipity['GET']['adminAction']) {
             echo '<div class="msg_notice"><span class="icon-attention-circled"></span> ' . sprintf(MULTICHECK_NO_DIR, $_SERVER['HTTP_REFERER']) . '</div>'."\n";
             break;
         }
-
         // case bulk multimove (leave the fake oldDir being send as an empty dir)
         if (isset($serendipity['POST']['oldDir']) && !empty($serendipity['POST']['newDir'])) {
             $messages = array();
             $multiMoveImages = $serendipity['POST']['multiDelete']; // The 'multiDelete' key name should better be renamed to 'multiCheck', but this would need to change 2k11/admin/serendipity_editor.js, images.inc.tpl, media_items.tpl, media_pane.tpl and this file
             unset($serendipity['POST']['multiDelete']);
+
             $oDir = ''; // oldDir is relative to Uploads/, since we can not specify a directory of a ML bulk move directly
             $nDir = serendipity_specialchars((string)$serendipity['POST']['newDir']); // relative to Uploads/
+
             if ($oDir != $nDir) {
                 foreach($multiMoveImages AS $mkey => $move_id) {
                     $file = serendipity_fetchImageFromDatabase((int)$move_id);
@@ -145,7 +146,7 @@ switch ($serendipity['GET']['adminAction']) {
             }
             $data['messages'] = $messages;
             unset($messages);
-            // return to last selected media library directory
+            // remember to return to last selected media library directory
             serendipity_restoreVar($serendipity['COOKIE']['serendipity_only_path'], $serendipity['GET']['only_path']);
             // fall back
             $data['case_default'] = true;
diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index d31478fa..a1128b03 100644
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -719,12 +719,16 @@ function serendipity_scaleImg($id, $width, $height) {
         exec($cmd, $output, $result);
         if ( $result != 0 ) {
             echo '<span class="msg_error"><span class="icon-attention-circled"></span> ' . sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) ."</span>\n";
+            return false;
         }
         unset($output, $result);
     }
 
-    serendipity_updateImageInDatabase(array('dimensions_width' => $width, 'dimensions_height' => $height, 'size' => @filesize($outfile)), $id);
-    return true;
+    if ($result == 0) {
+        serendipity_updateImageInDatabase(array('dimensions_width' => $width, 'dimensions_height' => $height, 'size' => @filesize($outfile)), $id);
+        return true;
+    }
+    return false;
 }
 
 /**
@@ -3402,7 +3406,7 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
     //   FILE    = File rename or File bulk move,
     //   FILEDIR = Media properties form edit
 
-    // images.inc case 'directoryEdit' via ML case 'directorySelect', which is ML Directories form
+    // images.inc case 'directoryEdit', which is ML Directories form, via ML case 'directorySelect'
     if ($type == 'dir') {
 
         $real_oldDir = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $oldDir;