[SWITCHYARD-2414] Fixed NPE