Handle 404 responses sanely
Merge pull request #3 from ianweller/master

Handle 404 responses sanely