Added watch exceptions