updated the exception handles to fit with the original Interface