Clean up some cases where we get nasty errors logged for things that
aren't really errors.