diff --git a/ground/gcs/src/app/main.cpp b/ground/gcs/src/app/main.cpp
index c8260c953..a200f8abd 100644
--- a/ground/gcs/src/app/main.cpp
+++ b/ground/gcs/src/app/main.cpp
@@ -209,6 +209,11 @@ inline QString msgSendArgumentFailed()
                                        "Unable to send command line arguments to the already running instance. It appears to be not responding.");
 }
 
+inline QString msgLogfileOpenFailed(const QString &fileName)
+{
+    return QCoreApplication::translate("Application", "Failed to open log file %1").arg(fileName);
+}
+
 // Prepare a remote argument: If it is a relative file, add the current directory
 // since the the central instance might be running in a different directory.
 inline QString prepareRemoteArgument(const QString &arg)
@@ -313,7 +318,7 @@ void logInit(QString fileName)
         logStream = new QTextStream(file);
         qInstallMessageHandler(mainMessageOutput);
     } else {
-        // TODO error popup
+        displayError(msgLogfileOpenFailed(fileName));
     }
 }
 
diff --git a/ground/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.cpp b/ground/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.cpp
index 2ff76a829..33a52cc9d 100644
--- a/ground/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.cpp
+++ b/ground/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.cpp
@@ -614,7 +614,7 @@ bool UAVObjectGeneratorGCS::process_object(ObjectInfo *object)
     ctxt.object = object;
 
     ctxt.registerImpl += ::generate(ctxt,
-                                  "    qmlRegisterType<:ClassName>(\"%1.:ClassName\", 1, 0, \":ClassName\");\n").arg("UAVTalk");
+                                    "    qmlRegisterType<:ClassName>(\"%1.:ClassName\", 1, 0, \":ClassName\");\n").arg("UAVTalk");
 
     for (int n = 0; n < object->fields.length(); ++n) {
         FieldInfo *field = object->fields[n];