diff --git a/src/image/ImageManagerDriver.cc b/src/image/ImageManagerDriver.cc
index 469a9659d5..cf19508544 100644
--- a/src/image/ImageManagerDriver.cc
+++ b/src/image/ImageManagerDriver.cc
@@ -373,12 +373,11 @@ static void mkfs_action(istringstream& is,
         goto error_img;
     }
 
-    if ( is.good() )
+    if ( is.fail() )
     {
         is >> source >> ws;
     }
-
-    if ( is.fail() )
+    else
     {
         goto error_img;
     }
diff --git a/src/tm/TransferManager.cc b/src/tm/TransferManager.cc
index a7365b1903..2dcff9158d 100644
--- a/src/tm/TransferManager.cc
+++ b/src/tm/TransferManager.cc
@@ -124,7 +124,7 @@ void TransferManager::trigger(Actions action, int _vid)
         break;
 
     case SAVEAS_HOT:
-        aname = "DRIVER_CANCEL";
+        aname = "SAVEAS_HOT";
         break;
 
     case DRIVER_CANCEL: