FIXUP - better error reporting
FIXUP - Remove file without any content messages.