diff -urp filedepot-v4/ajaxserver.php filedepot/ajaxserver.php
--- filedepot-v4/ajaxserver.php	2010-05-17 10:19:12.000000000 -0400
+++ filedepot/ajaxserver.php	2010-05-17 10:21:31.000000000 -0400
@@ -451,7 +451,6 @@ function filedepot_dispatcher($action) {
       $tags  = $_POST['tags'];
       $data = array();
       $data['tagerror'] = '';        
-      $data['errmsg'] = '';        
 
       if ($_POST['cid'] == 'incoming' AND $fid > 0) {
           $filemoved = FALSE;
@@ -485,18 +484,13 @@ function filedepot_dispatcher($action) {
             db_query("UPDATE {filedepot_files} SET title='%s',description='%s',date=%d WHERE fid=%d", $filetitle, $description, time(), $fid);
             // Test if user has selected a different directory and if they have perms then move else return FALSE;
             $filemoved = $filedepot->moveFile($fid, $newcid);
-            if ($filemoved == FALSE) {
-              $data['errmsg'] = t('Error moving file');
-            }
             $data['cid'] = $newcid;
             unset($_POST['tags']);  // Format tags will check this to format tags in case we are doing a search which we are not in this case.
             $data['tags'] = filedepot_formatfiletags($tags);
           }
           db_query("UPDATE {filedepot_fileversions} SET notes='%s' WHERE fid=%d and version=%d", $vernote, $fid, $version);
-          // Update the file tags if role or group permission set -- we don't support tag access perms at the user level.
           if ($filedepot->checkPermission($folder, 'view', 0, FALSE) AND !$nexcloud->update_tags($fid, $tags)) {
             $data['tagerror'] = t('Tags not added - Group view perms required');
-            $data['tags'] = '';
           }          
         }
         $data['retcode'] = 200;
diff -urp filedepot-v4/filedepot.class.php filedepot/filedepot.class.php
--- filedepot-v4/filedepot.class.php	2010-05-17 10:19:15.000000000 -0400
+++ filedepot/filedepot.class.php	2010-05-17 10:21:33.000000000 -0400
@@ -672,11 +672,11 @@ class filedepot {
           /* Need to move the file */
           $query2 = db_query("SELECT fname FROM {filedepot_fileversions} WHERE fid=%d", $fid);
           while ($A = db_fetch_array($query2)) {
-            $fname = stripslashes($A['fname']);
-            $sourcefile = $this->root_storage_path . "{$orginalCid}/{$fname}";
-            if (!is_dir($sourcefile) AND file_exists($sourcefile) )  {
+            $vname = stripslashes($A['vname']);
+            $sourcefile = $this->root_storage_path . "{$orginalCid}/{$vname}";
+            if ( file_exists($sourcefile) )  {
               watchdog('filedepot', 'Checking if file @file exists - TRUE', array('@file' => $sourcefile));
-              $targetfile = $this->root_storage_path . "{$newcid}/{$fname}";
+              $targetfile = $this->root_storage_path . "{$newcid}/{$vname}";
               // If there is more then 1 reference to this file in this category
               if ($dupfile_inuse) {
                 @copy($sourcefile, $targetfile);
@@ -692,7 +692,7 @@ class filedepot {
               $filemoved = TRUE;
             } 
             else {
-              watchdog('filedepot', 'Checking if file @file exists - FALSE', array('@file' => $sourcefile), WATCHDOG_ERROR);
+              watchdog('filedepot', 'Checking if file @file exists - FALSE', array('@file' => $sourcefile));
             }
           }
           if ($filemoved) {    // At least one file moved - so now update record
diff -urp filedepot-v4/js/common.js filedepot/js/common.js
--- filedepot-v4/js/common.js	2010-05-17 10:19:37.000000000 -0400
+++ filedepot/js/common.js	2010-05-17 10:21:54.000000000 -0400
@@ -873,7 +873,6 @@ function makeAJAXUpdateFileDetails(formO
             hideFileDetailsPanel();             
           } else if (oResults.filemoved && oResults.cid > 0) {
             document.location = siteurl + '?q=filedepot&cid=' + oResults.cid;
-          } else if (oResults.errmsg.length > 0) {
           } else {
             Dom.get('tagcloud_words').innerHTML = oResults.tagcloud;
           }