Found some more places where strings were thrown instead of Error()

Hopefully this makes those exceptions easier to debug.