883048 - Better handling of invalid consumer certs.

https://bugzilla.redhat.com/show_bug.cgi?id=883048

Other minor improvements.