Added terminate message and fix an error with previous commit
NOW is fixed