diff --git a/CHANGELOG b/CHANGELOG
index ae8da557e..3a8ebbde2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Zenmap][GH#639] Zenmap will no longer crash when no suitable temporary
+  directory is found. Patches contributed by [Varunram Ganesh] and [Sai Sundhar]
+
 o [Zenmap][GH#626] Zenmap now properly handles the -v0 (no output) option,
   which was added in Nmap 7.10. Previously, this was treated the same as not
   specifying -v at all. [lymanZerga11]
diff --git a/zenmap/zenmapGUI/ScanInterface.py b/zenmap/zenmapGUI/ScanInterface.py
index 13db98d82..4698988df 100644
--- a/zenmap/zenmapGUI/ScanInterface.py
+++ b/zenmap/zenmapGUI/ScanInterface.py
@@ -535,7 +535,16 @@ class ScanInterface(HIGVBox):
         """Run the given Nmap command. Add it to the list of running scans.
         Schedule a timer to refresh the output and check the scan for
         completion."""
-        command_execution = NmapCommand(command)
+        try:
+            command_execution = NmapCommand(command)
+        except IOError, e:
+            warn_dialog = HIGAlertDialog(
+                        message_format=_("Error building command"),
+                        secondary_text=_("Error message: %s") % str(e),
+                        type=gtk.MESSAGE_ERROR)
+            warn_dialog.run()
+            warn_dialog.destroy()
+            return
         command_execution.profile = profile
 
         try: