Merge pull request #194 from anthonytasca/master

removed some unhandled errors