Use InternalBundle instead of hand written code for null/arg checks