Litte improvementon of error management, logs, exceptions, etc...