Remove exception
Add comments