Adding Null Checks