diff --git a/api/sixtyfps-cpp/cmake/SixtyFPSMacro.cmake b/api/sixtyfps-cpp/cmake/SixtyFPSMacro.cmake
index b352d2998..b2b90eaf3 100644
--- a/api/sixtyfps-cpp/cmake/SixtyFPSMacro.cmake
+++ b/api/sixtyfps-cpp/cmake/SixtyFPSMacro.cmake
@@ -12,14 +12,12 @@ function(SIXTYFPS_TARGET_60_SOURCES target)
     foreach (it IN ITEMS ${ARGN})
         get_filename_component(_60_BASE_NAME ${it} NAME_WE)
         get_filename_component(_60_ABSOLUTE ${it} REALPATH BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-
         add_custom_command(
             OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_60_BASE_NAME}.h
             COMMAND SixtyFPS::sixtyfps_compiler ${_60_ABSOLUTE} > ${CMAKE_CURRENT_BINARY_DIR}/${_60_BASE_NAME}.h
             DEPENDS ${_60_ABSOLUTE}
-            COMMENT "Running sixtyfps_compiler on ${it}")
+            COMMENT "Generating ${_60_BASE_NAME}.h")
         target_sources(${target} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/${_60_BASE_NAME}.h)
     endforeach()
-    # FIXME: DO WE NEED THIS HERE?
     target_include_directories(${target} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 endfunction()
diff --git a/sixtyfps_compiler/diagnostics.rs b/sixtyfps_compiler/diagnostics.rs
index 9bc3526da..3b0a95c81 100644
--- a/sixtyfps_compiler/diagnostics.rs
+++ b/sixtyfps_compiler/diagnostics.rs
@@ -198,6 +198,10 @@ impl FileDiagnostics {
             Option<&'b codemap::CodeMap>,
         ) -> codemap_diagnostic::Emitter<'b>,
     ) {
+        if self.inner.is_empty() {
+            return;
+        }
+
         let mut codemap = codemap::CodeMap::new();
         let internal_errors = self.source.is_none();
         let file = codemap.add_file(