Ajay/DC | #3641 | Updated error message
Ajay | #3629 | Fixing fts