Add file/line to LOG. Revert to check without failure (check with failure cannot print anything)
Rename safeguards and add headers to header list.