diff --git a/C4/Circulation/Returns.pm b/C4/Circulation/Returns.pm
index 300a032..619ab64 100755
--- a/C4/Circulation/Returns.pm
+++ b/C4/Circulation/Returns.pm
@@ -76,19 +76,16 @@ sub Returns {
     #debug_msg($env,"item = $item");
     #if (($reason ne "Circ") && ($reason ne "Quit")) {
     if ($reason eq "")  {
-      ($reason,$bornum,$borrower,$itemno,$itemrec,$amt_owing) = checkissue($env,$dbh,$item);
-      #if (($reason ne "") && ($reason ne "Circ")  && ($reason ne "Quit")) {
-        if ($reason eq "Returned") {
+      my $resp;
+      ($resp,$bornum,$borrower,$itemno,$itemrec,$amt_owing) = checkissue($env,$dbh,$item);
+      if ($resp ne "") {
+        if ($resp eq "Returned") {
 	  my $fmtitem = fmtstr($env,$itemrec->{'title'},"L50");
-      	  unshift @items,$fmtitem;
-          $reason = "";     	  
-  	} elsif ($reason eq "Item not found" ) {
-	  error_msg($env,"$reason");
-	  $reason = "";
-	} else {
-          #debug_msg($env,"R2. $reason");
+      	  unshift @items,$fmtitem;     	  
+  	} elsif ($resp ne "") {
+	  error_msg($env,"$resp");
 	}
-      #}
+      }
     }
   }
   clearscreen;
diff --git a/C4/Interface.pm b/C4/Interface.pm
index 5f5ff7b..8d714f0 100755
--- a/C4/Interface.pm
+++ b/C4/Interface.pm
@@ -218,7 +218,7 @@ sub returnwindow {
   $panel->AddHotKey(NEWT_KEY_F11);
   my ($reason,$data)=$panel->Run();
   if ($reason eq NEWT_EXIT_HOTKEY) {
-    debug_msg($env, "Hotkey");
+    # debug_msg($env, "Hotkey");
     if ($data eq NEWT_KEY_F11){
        $reason="Quit";
      } elsif ($data eq NEWT_KEY_F10) {
@@ -229,7 +229,7 @@ sub returnwindow {
        $reason="Returns";
      }
   } else {
-    debug_msg($env, "Not Hot");  
+    # debug_msg($env, "Not Hot");  
     $stuff=$entry->Get();
     $reason="";
   }