changed names of 2 files and modified a few things
Merge pull request #253 from andy2013march/master

Added 2 exceptions and a few modifications