Merge "BUG-5020 Handling exception while submission"