Changed exception method names thrown to proper ones