cleaned errors handling