diff --git a/CoreRemoting/RemotingSession.cs b/CoreRemoting/RemotingSession.cs
index ab5ae79..f85ffa7 100644
--- a/CoreRemoting/RemotingSession.cs
+++ b/CoreRemoting/RemotingSession.cs
@@ -555,7 +555,8 @@ private void ProcessRpcMessage(WireMessage request)
                                 returnValue: result);
                 }
 
-                ((RemotingServer)_server).OnAfterCall(serverRpcContext);
+                if (serverRpcContext.Exception == null)
+                    ((RemotingServer)_server).OnAfterCall(serverRpcContext);
 
                 if (oneWay)
                     return;