--- a/pp/opannotate_options.cpp
+++ b/pp/opannotate_options.cpp
@@ -126,18 +126,10 @@
 		profile_spec::create(spec.common, options::image_path,
 				     options::root_path);
 
-	list<string> sample_files;
-again:
-	try {
-		sample_files = pspec.generate_file_list(exclude_dependent, true);
-	} catch (op_no_samples_exception & e) {
-		if (try_another_session_dir())
-			goto again;
-		else
-			throw op_fatal_error(e.what());
-	}
 	if (!was_session_dir_supplied())
 		cerr << "Using " << op_samples_dir << " for session-dir" << endl;
+
+	list<string> sample_files = pspec.generate_file_list(exclude_dependent, true);
 
 	cverb << vsfile << "Archive: " << pspec.get_archive_path() << endl;