catch some edge cases