diff --git a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
index 3b7f0a85a..e211bb4e0 100644
--- a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
+++ b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
@@ -151,7 +151,9 @@ class LimitSubqueryOutputWalker extends SqlWalker
 
         if (count($sqlIdentifier) === 0) {
             throw new \RuntimeException('The Paginator does not support Queries which only yield ScalarResults.');
-        } elseif (count($rootIdentifier) != count($sqlIdentifier)) {
+        }
+
+        if (count($rootIdentifier) != count($sqlIdentifier)) {
             throw new \RuntimeException(sprintf(
                 'Not all identifier properties can be found in the ResultSetMapping: %s',
                 implode(', ', array_diff($rootIdentifier, array_keys($sqlIdentifier)))