Add Null Pointer Catch