Revert "Added some emergency debug code to help solve a prod problem"

This reverts commit 9162cd99ff08ee6540feacd4ee917bb68ac21eea.
Keep facia-tool.log file name
Change back to Exception for InvalidContent
Merge branch 'revert-emergency-fix'