fixes gh-141 - better error handling on not found etc