Cleaned/Fixed Null Pointer