Minor tweaks with exception handling, removed test from .gitignore file.