issue #168 - some exception handling were broken - fixed now