Ashwin/DC | #4026 | showing the error message even after the edit