diff --git a/tools/oven/src/OvenCLIApplication.cpp b/tools/oven/src/OvenCLIApplication.cpp
index c02b42c0dc..ab56fd9255 100644
--- a/tools/oven/src/OvenCLIApplication.cpp
+++ b/tools/oven/src/OvenCLIApplication.cpp
@@ -38,7 +38,7 @@ OvenCLIApplication::OvenCLIApplication(int argc, char* argv[]) :
                               Q_ARG(QString, _outputUrlParameter.toString()), Q_ARG(QString, _typeParameter));
 }
 
-OvenCLIApplication::parseResult OvenCLIApplication::parseCommandLine(int argc, char* argv[], bool *enableCrashHandler) {
+OvenCLIApplication::parseResult OvenCLIApplication::parseCommandLine(int argc, char* argv[], bool &enableCrashHandler) {
     // parse the command line parameters
     QCommandLineParser parser;
 
@@ -71,7 +71,7 @@ OvenCLIApplication::parseResult OvenCLIApplication::parseCommandLine(int argc, c
     }
 
     if (parser.isSet(forceCrashReportingOption)) {
-        *enableCrashHandler = true;
+        enableCrashHandler = true;
     }
 
     if (parser.isSet(versionOption)) {
diff --git a/tools/oven/src/OvenCLIApplication.h b/tools/oven/src/OvenCLIApplication.h
index e4f75df16e..6dd26967f5 100644
--- a/tools/oven/src/OvenCLIApplication.h
+++ b/tools/oven/src/OvenCLIApplication.h
@@ -26,7 +26,20 @@ public:
         CLIMode
     };
 
-    static parseResult parseCommandLine(int argc, char* argv[], bool *enableCrashHandler);
+    /**
+     * @brief Parses the command line arguments
+     *
+     * Oven can operate both in GUI and CLI mode. Depending on which arguments are passed,
+     * we pick the mode to use, and this function returns it.
+     *
+     * Both modes can have the crash handler enabled.
+     *
+     * @param argc argc
+     * @param argv argv
+     * @param enableCrashHandler Output parameter -- whether the crash handler should be enabled.
+     * @return parseResult Which application we should run
+     */
+    static parseResult parseCommandLine(int argc, char* argv[], bool &enableCrashHandler);
 
     static OvenCLIApplication* instance() { return dynamic_cast<OvenCLIApplication*>(QCoreApplication::instance()); }
 
diff --git a/tools/oven/src/main.cpp b/tools/oven/src/main.cpp
index 66e79806fa..3781ae597f 100644
--- a/tools/oven/src/main.cpp
+++ b/tools/oven/src/main.cpp
@@ -56,7 +56,7 @@ int main (int argc, char** argv) {
 
     // figure out if we're launching our GUI application or just the simple command line interface
     bool enableCrashHandler = false;
-    OvenCLIApplication::parseResult res = OvenCLIApplication::parseCommandLine(argc, argv, &enableCrashHandler);
+    OvenCLIApplication::parseResult res = OvenCLIApplication::parseCommandLine(argc, argv, enableCrashHandler);
 
     switch(res) {
         case OvenCLIApplication::CLIMode: