Fix for exception in worker?