Actually test for null rather than rely on boolean logic here as we don't want null and false treated the same in this case