diff --git a/src/rpc/cli.cpp b/src/rpc/cli.cpp
index 2788f49..0021ada 100644
--- a/src/rpc/cli.cpp
+++ b/src/rpc/cli.cpp
@@ -14,12 +14,6 @@
 # endif
 #endif
 
-#ifdef WIN32
-# include <signal.h>
-#else
-# include <csignal>
-#endif
-
 namespace fc { namespace rpc {
 
 static std::vector<std::string>& cli_commands()
@@ -109,15 +103,15 @@ void cli::run()
          }
          else
             std::cout << itr->second( result, args ) << "\n";
-
-         if (result.is_integer() && result.as_int64() == SIGQUIT) 
-         {
-            break;
-         }
       }
       catch ( const fc::exception& e )
       {
          std::cout << e.to_detail_string() << "\n";
+
+         if (e.code() == fc::canceled_exception_code)
+         {
+            break;
+         }
       }
    }
 }