Change all error to criticl to avoid exit
More work.