Updates State#resolve to return null if the state can't be resolved
instead of throwing an exception.