Merge "composer: fix null pointer dereference"