I'm not a client, edge cases, and more