Manualy merged jmclem error handling.
Removed mac specific file from git.