NULL Pointer Dereference FIX
issue