Improve some exception messages

Signed-off-by: Andy Grover <agrover@redhat.com>