Properly handle some errors

[mpaolino]

Hi guys. I hope you guys take public contributions.

I was just dipping my toe into this code and I found some things that needed small improvements. I'll be submitting several PRs, I hope that's ok.

This one just adds some error handling in some missing places with their accompanying tests.

Have a nice day!