[PATCH] missing NULL checks in initializer handling