Better error handling for troublesome links