Add additional quoting around log/error messages

Fixes #357