Fix #7695 and add self to AUTHORS

Please somebody take a peek to ensure this approach is right (i.e. log and return None) and then I'll close the user-reported bug if appropriate. Thanks!