Added exception handling and test plugin for it
added the plugin..