diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp
index 40a09ba8e..a957c75c9 100644
--- a/tdeioslave/media/libmediacommon/notifiersettings.cpp
+++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp
@@ -161,8 +161,10 @@ void NotifierSettings::resetAutoAction( const TQString &mimetype )
 	if ( m_autoMimetypesMap.contains( mimetype ) )
 	{
 		NotifierAction *action = m_autoMimetypesMap[mimetype];
-		action->removeAutoMimetype( mimetype );
-		m_autoMimetypesMap.remove(mimetype);
+		if ( action ) {
+			action->removeAutoMimetype( mimetype );
+		}
+		m_autoMimetypesMap[mimetype] = 0L;
 	}
 }