Fixes bug with invalid verification when entity is undefined