Updates exceptions to using proper exception classes