Catch a few edge cases