Merge pull request #44 from tpluscode/master

cleanup
mitigate loader exceptions to some extent