Change delim error message
Fix second part of messages
Merge remote-tracking branch 'origin/tc-fix'