Fix NullPointerException for Constant Null value