Adding codes to handle no ndnd exception
7 files changed