! Improve signature error handling (fixes #2157)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>