Merge pull request #312 from mhaskel/test_osx_graceful_failure