! Improve signature error handling (fixes #2157)

This is a "proper" fix for handling errors with signatures...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>