move check for null to using place