[3.0] Prevention of Null pointer dereference