! Improve signature error handling (fixes #2157)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #2165 from Oldiesmann/release-2.1

! Improve signature error handling (fixes #2157)