diff --git a/2019/src/runner.cpp b/2019/src/runner.cpp
index 7cf8004..5beefcb 100644
--- a/2019/src/runner.cpp
+++ b/2019/src/runner.cpp
@@ -6,51 +6,55 @@
 namespace po = boost::program_options;
 
 struct AoCOptions {
-    int day;
-    bool part2;
+    aoc2019::solution_t implementation;
     bool run_timer;
 };
 
 static AoCOptions parse_options(const int argc, const char *argv[]) {
     AoCOptions options{};
+    int day;
+    bool part2;
     po::options_description desc("Allowed options");
     desc.add_options()
-            ("day", po::value<int>(&options.day)->required(), "The day to run.")
-            ("part2,2", po::bool_switch(&options.part2), "Whether to run part 2.")
+            ("day", po::value<int>(&day)->required(), "The day to run.")
+            ("part2,2", po::bool_switch(&part2), "Whether to run part 2.")
             ("timer,t", po::bool_switch(&options.run_timer), "Show the execution time.");
 
     po::positional_options_description positionals;
     positionals.add("day", 1);
 
-    po::variables_map vm;
+    try {
+        po::variables_map vm;
 
-    po::store(po::command_line_parser(argc, argv).options(desc).positional(positionals).run(), vm);
-    po::notify(vm);
+        po::store(po::command_line_parser(argc, argv).options(desc).positional(positionals).run(), vm);
+        po::notify(vm);
 
-    return options;
+        options.implementation = aoc2019::get_implementation(day, part2);
+
+        return options;
+    } catch (po::error &argument_error) {
+        std::cerr << argument_error.what() << std::endl;
+        std::exit(1);
+    } catch (std::out_of_range &) {
+        std::cerr << "Invalid day: " << day
+                  << ".\n Valid range: [1, 25].\n";
+        std::exit(1);
+    }
 }
 
 int main(int argc, const char *argv[]) {
-    try {
-        const auto options = parse_options(argc, argv);
+    const auto options = parse_options(argc, argv);
 
-        const aoc2019::solution_t solution = aoc2019::get_implementation(options.day, options.part2);
-        if (solution != nullptr) {
-            const auto start = std::chrono::high_resolution_clock::now();
-            solution(std::cin, std::cout);
-            if (options.run_timer) {
-                const std::chrono::duration<double> duration = std::chrono::high_resolution_clock::now() - start;
-                std::cerr << "Time taken: " << duration.count() << "s\n";
-            }
-            return 0;
-        } else {
-            std::cerr << "Unimplemented.\n";
-            return 1;
+    if (options.implementation != nullptr) {
+        const auto start = std::chrono::high_resolution_clock::now();
+        options.implementation(std::cin, std::cout);
+        if (options.run_timer) {
+            const std::chrono::duration<double> duration = std::chrono::high_resolution_clock::now() - start;
+            std::cerr << "Time taken: " << duration.count() << "s\n";
         }
-    } catch (po::required_option &ignored) {
-        return 1;
-    } catch (std::out_of_range &ignored) {
-        std::cerr << "Invalid day.\n";
+        return 0;
+    } else {
+        std::cerr << "Unimplemented.\n";
         return 1;
     }
 }