Moving checks from invocation to instantiation