Fixed introduced null pointer in previous merge.