b1597 fix null pointer exception in workshop collector.