WIP - cleanup error handling for signatures