Time for action – Adding support for errors