diff --git a/network/src/main/java/io/bitsquare/p2p/P2PService.java b/network/src/main/java/io/bitsquare/p2p/P2PService.java
index 13663007ca..66a89ec552 100644
--- a/network/src/main/java/io/bitsquare/p2p/P2PService.java
+++ b/network/src/main/java/io/bitsquare/p2p/P2PService.java
@@ -776,8 +776,9 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
     }
 
     @VisibleForTesting
+    @Nullable
     public KeyRing getKeyRing() {
-        return optionalKeyRing.get();
+        return optionalKeyRing.isPresent()? optionalKeyRing.get() : null;
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////