diff --git a/src/PagePropsStatementCountLookup.php b/src/PagePropsStatementCountLookup.php
index 3799f46..7a0f2ca 100644
--- a/src/PagePropsStatementCountLookup.php
+++ b/src/PagePropsStatementCountLookup.php
@@ -4,6 +4,7 @@
 
 use LoadBalancer;
 use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\Repo\WikibaseRepo;
 
 class PagePropsStatementCountLookup implements StatementsCountLookup {
 
@@ -14,13 +15,15 @@ public function __construct( LoadBalancer $loadBalancer ) {
 	}
 
 	public function getStatementCount( EntityId $entityId ) {
+		$wikibaseRepo = WikibaseRepo::getDefaultInstance();
+
 		$db = $this->loadBalancer->getConnection( DB_MASTER );
 
 		$res = $db->selectRow(
 			array( 'page_props', 'page' ),
 			array( 'pp_value' ),
 			array(
-				'page_namespace' => 0,
+				'page_namespace' => array_values( $wikibaseRepo->getEntityNamespaces() ),
 				'page_title' => $entityId->getSerialization(),
 				'pp_propname' => 'wb-claims'
 			),
@@ -32,7 +35,7 @@ public function getStatementCount( EntityId $entityId ) {
 		$this->loadBalancer->closeConnection( $db );
 
 		if ( $res === false ) {
-			return 0;
+			throw new Exception( "Could not find entity in page_props!" );
 		}
 
 		return (int)$res->pp_value;