Added Fixes
Added Fixes


Former-commit-id: 7977050f578a9bc44e9ed33203b5bee3a424153e
Former-commit-id: 8fc26c1b9a6af8c9742c00a659f2169c9396425d
richpeck/exception_handler,richpeck/exception_handler,richpeck/exception_handler