Added case where no message is found