Fix for Null Pointer