Added message "Not found". Refactoring.