handle no-match situations more gracefully