Better handling of 'no word found'