Fix for issue #70
"Did you forget terminator" now only appears where it should