diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py
index 1bec4b6a4a8..bd098dff965 100755
--- a/lib/galaxy/tools/__init__.py
+++ b/lib/galaxy/tools/__init__.py
@@ -848,7 +848,10 @@ class DefaultToolState( object ):
         # Restore from string
         values = json_fix( simplejson.loads( value ) )
         self.page = values.pop( "__page__" )
-        self.rerun_remap_job_id = values.pop( "__rerun_remap_job_id__" )
+        if '__rerun_remap_job_id__' in values:
+            self.rerun_remap_job_id = values.pop( "__rerun_remap_job_id__" )
+        else:
+            self.rerun_remap_job_id = None
         self.inputs = params_from_strings( tool.inputs, values, app, ignore_errors=True )
 
 class ToolOutput( object ):