diff --git a/src/sakia/core/net/api/bma/access.py b/src/sakia/core/net/api/bma/access.py
index e0d4440b44b38b0a72c9e2a7ae595eb2b35ee2b8..e02151e25ba58d76e904f69427748f5025fd576d 100644
--- a/src/sakia/core/net/api/bma/access.py
+++ b/src/sakia/core/net/api/bma/access.py
@@ -281,8 +281,9 @@ class BmaAccess(QObject):
                 except jsonschema.ValidationError as e:
                     logging.debug(str(e))
                     tries += 1
-        else:
+        if len(nodes) == 0 or json_data is None:
             raise NoPeerAvailable("", len(nodes))
+        return json_data
 
     @asyncio.coroutine
     def broadcast(self, request, req_args={}, post_args={}):