ROASTER-18: Fixed NPE