'export-world' now catches 'IllegalStateException's

Fixes #267
Merge branch '5.0.x' into topic