1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/isode/stroke/network/HostAddress.java b/src/com/isode/stroke/network/HostAddress.java
index 94ae1f7..7145fb3 100644
--- a/src/com/isode/stroke/network/HostAddress.java
+++ b/src/com/isode/stroke/network/HostAddress.java
@@ -26,6 +26,11 @@ public class HostAddress {
 
     @Override
     public String toString() {
+        // toString() should always be callable without risking 
+        // NullPointerException
+        if (address_ == null) {
+            return "<no address>";
+        }
         return address_.getHostAddress();
     }
 
@@ -51,6 +56,6 @@ public class HostAddress {
     InetAddress getInetAddress() {
         return address_;
     }
-
+    
     private final InetAddress address_;
 }