[PATCH v2 OLK-6.6 0/5] Fix NULL pointer dereference