diff --git a/app/PlaYUVerApp.cpp b/app/PlaYUVerApp.cpp
index 7207dc6..c3f2d26 100644
--- a/app/PlaYUVerApp.cpp
+++ b/app/PlaYUVerApp.cpp
@@ -329,10 +329,16 @@ Void PlaYUVerApp::save()
     if( !fileName.isEmpty() )
     {
       m_cLastOpenPath = QFileInfo( fileName ).path();
-      if( !saveWindow->save( fileName ) )
+      try
+      {
+        saveWindow->save( fileName );
+      }
+      catch( const char *msg )
       {
         QApplication::restoreOverrideCursor();
-        QMessageBox::warning( this, tr( "plaYUVer" ), tr( "Cannot save file %1" ).arg( fileName ) );
+        QString warningMsg = "Cannot save file " + QFileInfo( fileName ).fileName() + " with the following error: \n" + msg;
+        QMessageBox::warning( this, QApplication::applicationName(), warningMsg );
+        printMessage( warningMsg, LOG_ERROR );
         return;
       }
     }
diff --git a/lib/StreamHandlerPortableMap.cpp b/lib/StreamHandlerPortableMap.cpp
index 9784b96..b78f2be 100644
--- a/lib/StreamHandlerPortableMap.cpp
+++ b/lib/StreamHandlerPortableMap.cpp
@@ -83,6 +83,7 @@ Bool StreamHandlerPortableMap::openHandler( std::string strFilename, Bool bInput
     }
     else
     {
+      closeHandler();
       return false;
     }
   }