Added exception mechanism