Better error checking for endorsements