Better error management.