Typos
Added exceptions