Bug FIx: Removed Null pointer Exception