update exception message
Some architectural changes