diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
index b5288aa9aebdc1ce4de04f78559e50e53b3030f2..7bde1847a464c36749d9f0c3e87b6974e407b5bb 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
@@ -194,7 +194,7 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerPdo extends SimpleSAML_Metadata_
 		$metadata->execute();
 		$retrivedEntityIDs = $metadata->fetch();
 
-		if(count($retrivedEntityIDs) > 0){
+		if($retrivedEntityIDs !== FALSE && count($retrivedEntityIDs) > 0){
 			$stmt = $this->pdo->prepare("UPDATE $tableName SET entity_data = :entity_data WHERE entity_id = :entity_id");
 		}
 		else{