Good point, thanks, I will adapt the exception classes.