Add to handle exception