Import updated, error management added.