diff --git a/hive/indexer/mock_block_provider.py b/hive/indexer/mock_block_provider.py
index 32a38b84bf71b07122faf6cd7253a12fbe02f23a..429d7a29653e8df979fab611c7c81f6b05cea686 100644
--- a/hive/indexer/mock_block_provider.py
+++ b/hive/indexer/mock_block_provider.py
@@ -50,6 +50,9 @@ class MockBlockProvider(MockDataProvider):
 
     @classmethod
     def get_block_data(cls, block_num, make_on_empty=False):
+        if len(cls.block_data) == 0:
+            return None
+
         data = cls.block_data.get(block_num, None)
 
         #if data is not None:
@@ -57,8 +60,7 @@ class MockBlockProvider(MockDataProvider):
 
         if make_on_empty and data is None:
             data = cls.make_empty_block(block_num)
-            if data is None:
-                raise MockDataProviderException("No more blocks to serve")
+
         return data
 
     @classmethod