Added more elegant exception handling