[Shashi] - error handling and re org