Added Fixes
Added Fixes


Former-commit-id: 634c37cdfcc025c73f94aeed7938f9dcd780a556
Former-commit-id: 29637885185b8d5671c06cc3139bed833bdb7038
richpeck/exception_handler,richpeck/exception_handler,richpeck/exception_handler