Null argument checks introduced,