diff --git a/bumblebee_status/modules/contrib/publicip.py b/bumblebee_status/modules/contrib/publicip.py
index 17a23e3..a74d708 100644
--- a/bumblebee_status/modules/contrib/publicip.py
+++ b/bumblebee_status/modules/contrib/publicip.py
@@ -16,13 +16,13 @@ class Module(core.module.Module):
         self.__ip = ""
 
     def public_ip(self, widget):
-        return self.__ip
+        return self.__ip or "n/a"
 
     def update(self):
         try:
             self.__ip = util.location.public_ip()
         except Exception:
-            self.__ip = "n/a"
+            self.__ip = None
 
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/tests/modules/contrib/test_publicip.py b/tests/modules/contrib/test_publicip.py
index 9584bd7..870ede6 100644
--- a/tests/modules/contrib/test_publicip.py
+++ b/tests/modules/contrib/test_publicip.py
@@ -26,6 +26,15 @@ class PublicIPTest(TestCase):
 
         assert widget(module).full_text() == '5.12.220.2'
 
+    @mock.patch('util.location.public_ip')
+    def test_public_ip(self, public_ip_mock):
+        public_ip_mock.return_value = None
+
+        module = build_module()
+        module.update()
+
+        assert widget(module).full_text() == 'n/a'
+
     @mock.patch('util.location.public_ip')
     def test_public_ip_with_exception(self, public_ip_mock):
         public_ip_mock.side_effect = Exception