Change return values from nil to false