Fixing stupid `error` errors
Merge pull request #336 from andrewhayward/error-handling

Fixing stupid `error` errors