#16 fixing NPE while deploying subsystem