Fixing issue when workbench doesn't exist