Fixing typo and inconsistent use of null vs false return values