Handle edge cases with one/none signatures