diff --git a/module_build_service/pdc.py b/module_build_service/pdc.py
index 4c9fc5d8..c1668fcf 100644
--- a/module_build_service/pdc.py
+++ b/module_build_service/pdc.py
@@ -187,11 +187,6 @@ def get_module(session, module_info, strict=False):
     #query['ordering'] = '-variant_release'
     retval = session['unreleasedvariants/'](page_size=1, **query)
 
-    # Jump to last page to latest module release.
-    if retval['count'] != 1:
-        query['page'] = retval['count']
-        retval = session['unreleasedvariants/'](page_size=1, **query)
-
     # Error handling
     if not retval or len(retval["results"]) == 0:
         if strict:
@@ -199,6 +194,11 @@ def get_module(session, module_info, strict=False):
         else:
             return None
 
+    # Jump to last page to latest module release.
+    if retval['count'] != 1:
+        query['page'] = retval['count']
+        retval = session['unreleasedvariants/'](page_size=1, **query)
+
     results = retval["results"]
     assert len(results) <= 1, pprint.pformat(retval)
     return results[0]