I agree, pushed this check to be done using precondtions