removing unnecessary null checks

1 job for master in 2 minutes and 15 seconds (queued for 3 seconds)