Dileep/DC | #2952 |testing for exception instead of message