Handle some unlikely edge cases