[PATCH 14/14] Cleanup: remove confusing NULL check