#8 Better management of exceptions