Separate possibly unknown classes

Fixes #522
Merge pull request #553 from kenzierocks/fix-world-mis-crash

Separate possibly unknown classes