Fix some more places where strings were thrown rather than Error().