Change exception to warning
Merge branch 'outlook_fixes'