diff --git a/mu-grpc-server.cabal b/mu-grpc-server.cabal
--- a/mu-grpc-server.cabal
+++ b/mu-grpc-server.cabal
@@ -1,6 +1,6 @@
 cabal-version:       >=1.10
 name:                mu-grpc-server
-version:             0.1.0.0
+version:             0.1.0.1
 synopsis:            gRPC servers for Mu definitions
 description:         With @mu-grpc-server@ you can easily build gRPC servers for mu-haskell!
 license:             Apache-2.0
diff --git a/src/Mu/GRpc/Server.hs b/src/Mu/GRpc/Server.hs
--- a/src/Mu/GRpc/Server.hs
+++ b/src/Mu/GRpc/Server.hs
@@ -32,6 +32,7 @@
 import           Control.Concurrent.Async
 import           Control.Concurrent.STM        (atomically)
 import           Control.Concurrent.STM.TMVar
+import           Control.Exception
 import           Control.Monad.Except
 import           Data.ByteString               (ByteString)
 import qualified Data.ByteString.Char8         as BS
@@ -179,6 +180,11 @@
         Left (ServerError code msg)
           -> closeEarly $ GRPCStatus (serverErrorToGRpcError code)
                                      (BS.pack msg)
+    `catches`
+    [ Handler (\(e :: GRPCStatus) -> throwIO e)
+    , Handler (\(e :: SomeException) -> closeEarly $ GRPCStatus INTERNAL (BS.pack $ show e))
+    ]
+
   where
     serverErrorToGRpcError :: ServerErrorCode -> GRPCStatusCode
     serverErrorToGRpcError Unknown         = UNKNOWN