From ca1ae7cf9b4c75f677f453be1fb7d9a06c17194d Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 12 Sep 2014 13:54:13 +0100
Subject: [PATCH] Fix bug where we didn't return a tuple when expected.

---
 synapse/storage/pdu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/storage/pdu.py b/synapse/storage/pdu.py
index 3cbce2d0a..f780111b3 100644
--- a/synapse/storage/pdu.py
+++ b/synapse/storage/pdu.py
@@ -516,7 +516,7 @@ class StatePduStore(SQLBaseStore):
 
         if not current:
             logger.debug("get_unresolved_state_tree No current state.")
-            return return_value
+            return (return_value, None)
 
         return_value.current_branch.append(current)