diff --git a/barbicanclient/secrets.py b/barbicanclient/secrets.py
index 2ed41d75..a8f5a4e5 100644
--- a/barbicanclient/secrets.py
+++ b/barbicanclient/secrets.py
@@ -336,7 +336,7 @@ class Secret(SecretFormatter):
         """
 
         if not self.payload:
-            raise exceptions.PayloadException("Missing Payload")
+            raise exceptions.PayloadException("Invalid or Missing Payload")
         if not self.secret_ref:
             raise LookupError("Secret is not yet stored.")
 
diff --git a/barbicanclient/tests/test_secrets.py b/barbicanclient/tests/test_secrets.py
index 91beb8b0..4df946e3 100644
--- a/barbicanclient/tests/test_secrets.py
+++ b/barbicanclient/tests/test_secrets.py
@@ -18,7 +18,7 @@ import json
 from oslo_utils import timeutils
 
 from barbicanclient.tests import test_client
-from barbicanclient import secrets, base
+from barbicanclient import secrets, base, exceptions
 
 
 class SecretData(object):
@@ -417,6 +417,30 @@ class WhenTestingSecrets(test_client.BaseEntityResource):
         self.assertRaises(ValueError, self.manager.get,
                           **{'secret_ref': '12345'})
 
+    def test_should_fail_update_zero(self):
+        data = {'secret_ref': self.entity_href}
+        self.responses.post(self.entity_base + '/', json=data)
+
+        secret = self.manager.create()
+        secret.payload = None
+        secret.store()
+
+        self.responses.put(self.entity_href, status_code=204)
+        secret.payload = 0
+
+        # Verify that an error is thrown
+        self.assertRaises(exceptions.PayloadException, secret.update)
+
+    def test_should_fail_store_zero(self):
+        data = {'secret_ref': self.entity_href}
+        self.responses.post(self.entity_base + '/', json=data)
+
+        secret = self.manager.create()
+        secret.name = self.secret.name
+        secret.payload = 0
+
+        self.assertRaises(exceptions.PayloadException, secret.store)
+
     def test_should_fail_decrypt_no_content_types(self):
         data = self.secret.get_dict(self.entity_href)
         self.responses.get(self.entity_href, json=data)