added exception resolver