Fixed crashes on server
Merge pull request #69 from odininon/master

Fixed crashes on server & import cleanup