diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 00e4bacc2b1..400878332ab 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-09  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
+
+	* blockframe.c (find_pc_partial_function): Set *block to nullptr
+	when the function fails.
+
 2019-08-09  Andreas Arnez  <arnez@linux.ibm.com>
 
 	* s390-tdep.c (s390_type_align): New function.
diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index fe7807b87a6..4462274f46d 100644
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -331,6 +331,8 @@ find_pc_partial_function (CORE_ADDR pc, const char **name, CORE_ADDR *address,
 	*address = 0;
       if (endaddr != NULL)
 	*endaddr = 0;
+      if (block != nullptr)
+	*block = nullptr;
       return 0;
     }