Errors handling is fixed