Forgot a try/catch
Merge pull request #2 from Gregadeaux/master

Pull Request