Index: trunk/Ohana/src/opihi/pantasks/ControllerOps.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/ControllerOps.c	(revision 11446)
+++ trunk/Ohana/src/opihi/pantasks/ControllerOps.c	(revision 11898)
@@ -352,4 +352,9 @@
   }
   
+  /* for commands which don't return a prompt, don't look for one */
+  if (response == NULL) {
+      return (TRUE);
+  }
+
   /* watch for response - wait up to 1 second */
   line = NULL;
@@ -456,9 +461,9 @@
   sprintf (cmd, "quit");
   InitIOBuffer (&buffer, 0x100);
-  status = ControllerCommand (cmd, "", &buffer);
-  FreeIOBuffer (&buffer);
-
-  /* the quit command does not return a prompt, so we always 
-     get an error on the controller here */
+  status = ControllerCommand (cmd, NULL, &buffer);
+  FreeIOBuffer (&buffer);
+
+  /* the quit command does not return a prompt, 
+     check that the controller exited */
   StopController ();
   return (TRUE);