Feature/improve record not found message