diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index ec3fc93a95f..c3e4c935f06 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-28  Gary Benson  <gbenson@redhat.com>
+
+	* linux-low.c (linux_async): Replace fatal with warning.
+	Tidy up and return.
+	(linux_start_non_stop): Return -1 if linux_async failed.
+
 2014-08-28  Gary Benson  <gbenson@redhat.com>
 
 	* linux-x86-low.c (i386_dr_low_set_addr): Replace check with
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index f8b3e68ff2c..ec3260e1bc8 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -5107,7 +5107,14 @@ linux_async (int enable)
       if (enable)
 	{
 	  if (pipe (linux_event_pipe) == -1)
-	    fatal ("creating event pipe failed.");
+	    {
+	      linux_event_pipe[0] = -1;
+	      linux_event_pipe[1] = -1;
+	      sigprocmask (SIG_UNBLOCK, &mask, NULL);
+
+	      warning ("creating event pipe failed.");
+	      return previous;
+	    }
 
 	  fcntl (linux_event_pipe[0], F_SETFL, O_NONBLOCK);
 	  fcntl (linux_event_pipe[1], F_SETFL, O_NONBLOCK);
@@ -5140,6 +5147,10 @@ linux_start_non_stop (int nonstop)
 {
   /* Register or unregister from event-loop accordingly.  */
   linux_async (nonstop);
+
+  if (target_is_async_p () != (nonstop != 0))
+    return -1;
+
   return 0;
 }