Revert "Fixes. Typos and Exceptions not defined."

This reverts commit f99e17c3496863bf4e1f3ae9c6cd91148e9dbd96.