Merge pull request #1424 from marcel-blonk/PLFM-2890b

handle unavailable table better and easier creation of workers
Merge pull request #1425 from marcel-blonk/PLFM-2890b

code review: remove unused code