Refactor, no functional change
Check for null