A better way to check for errors, and apply the previous fix to signature writes...