Add null constant argument type check