add assign to if (is) proposal + squash npe