It's easy to fall into the trap of introducing even more edge cases by handling some other edge cases.

The correct way to handle edge cases is to not have them in the design. Easier said than done. And sometimes the edge cases are in the spec. Sometimes they are justified, but often they are not. These should be eliminated before the spec is finalized.