Option can be required
Fixed exception handling