#36 cleaned up exceptions