Rohan, Shruthi | #1399 | Fixing the problem of newly added diagnosis getting unset on error during save