Exceptions logic implementation, test etc
Update