diff --git a/src/ChangeLog b/src/ChangeLog
index 74482f8c84da7bf46d9c2a8a9d760b2cbb691ea5..1af0a8193cf4eebadd25fb4872dcfc59b9779f40 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-02  Martin Rudalics  <rudalics@gmx.at>
+
+	* frame.c (check_minibuf_window): Don't abort if no window was
+	found (Bug#15247).
+
 2013-09-02  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	Use XGetMotionEvents to ask the last mouse motion time from X server.
diff --git a/src/frame.c b/src/frame.c
index 5ee421bb9bf88259278ba2a3e1aa0467f281ddf2..e33426c2a44f7527fb8c4436940139ed0c64f59d 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1137,9 +1137,8 @@ check_minibuf_window (Lisp_Object frame, int select)
 	      }
 	  }
 
-      if (!WINDOWP (window))
-	emacs_abort ();
-      else
+      /* Don't abort if no window was found (Bug#15247).  */
+      if (WINDOWP (window))
 	{
 	  /* Use set_window_buffer instead of Fset_window_buffer (see
 	     discussion of bug#11984, bug#12025, bug#12026).  */