Merge pull request #3 from schancel/FixMacOSExceptions

First attempt at fixing MacOS Exceptions.