Error messaage minor fixes