diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 667bf27fe12..b6355e799b5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-29  Kevin Buettner  <kevinb@redhat.com>
+
+	* infcmd.c (finish_command_fsm_should_stop): Don't attempt to
+	record a NULL value.
+
 2015-09-29  Kevin Buettner  <kevinb@redhat.com>
 
 	* msp430-tdep.c (msp430_push_dummy_call): Treat reference, struct,
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index c4d7d8b5d6d..54aa1ef4cc4 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1794,7 +1794,8 @@ finish_command_fsm_should_stop (struct thread_fsm *self)
 
 	  func = read_var_value (f->function, NULL, get_current_frame ());
 	  rv->value = get_return_value (func, rv->type);
-	  rv->value_history_index = record_latest_value (rv->value);
+	  if (rv->value != NULL)
+	    rv->value_history_index = record_latest_value (rv->value);
 	}
     }
   else if (tp->control.stop_step)