#37 exception class correction