Added case where no message is found
Merge branch 'MarksCode'