diff --git a/zephyr/tests.py b/zephyr/tests.py
index 21ca9b2557..0cc29569a7 100644
--- a/zephyr/tests.py
+++ b/zephyr/tests.py
@@ -362,7 +362,7 @@ class ZephyrPOSTTest(AuthedTestCase):
         result = self.client.post("/send_message/", {"type": "invalid type",
                                                      "content": "Test message",
                                                      "recipient": "othello@humbughq.com"})
-        self.assert_json_error(result, "Invalid zephyr type")
+        self.assert_json_error(result, "Invalid message type")
 
 class DummyHandler(object):
     def __init__(self, callback):
diff --git a/zephyr/views.py b/zephyr/views.py
index f2214fd7c3..78f5a3b212 100644
--- a/zephyr/views.py
+++ b/zephyr/views.py
@@ -390,7 +390,7 @@ def zephyr_backend(request, user_profile, sender):
             recipient = Recipient.objects.get(type_id=recipient_user_profile.id,
                                               type=Recipient.PERSONAL)
     else:
-        return json_error("Invalid zephyr type")
+        return json_error("Invalid message type")
 
     new_zephyr = Zephyr()
     new_zephyr.sender = UserProfile.objects.get(user=sender)