Added an Error handler.
Modified the MakeActive() & MakeInactive() functions of the Data component to use the new Error Handler.