Add new source files
Add new source files exception handling