CLN: Fixups to exceptions in generic

Improved message and better exception types.