exceptions support has been added
working on site test