diff --git a/tools/nitpick/CMakeLists.txt b/tools/nitpick/CMakeLists.txt
index 9d8f715114..efb1e0b798 100644
--- a/tools/nitpick/CMakeLists.txt
+++ b/tools/nitpick/CMakeLists.txt
@@ -185,6 +185,12 @@ if (APPLE)
   # call the fixup_nitpick macro to add required bundling commands for installation
   fixup_nitpick()
 
+  # add a custom command to copy the empty Apps/Data High Fidelity folder (i.e. - a valid folder with no entities)
+  add_custom_command(
+    TARGET ${TARGET_NAME}
+    POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "$<TARGET_FILE_DIR:${TARGET_NAME}>/AppDataHighFidelity"
+  )
 else()
   set(NITPICK_EXEC_DIR "$<TARGET_FILE_DIR:${TARGET_NAME}>")
   set(RESOURCES_DEV_DIR "${NITPICK_EXEC_DIR}/resources")
@@ -218,6 +224,14 @@ else()
     set(EXECUTABLE_COMPONENT ${CLIENT_COMPONENT})
 
     optional_win_executable_signing()
+
+    # add a custom command to copy the empty Apps/Data High Fidelity folder (i.e. - a valid folder with no entities)
+    add_custom_command(
+      TARGET ${TARGET_NAME}
+      POST_BUILD
+      COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "$<TARGET_FILE_DIR:${TARGET_NAME}>/AppDataHighFidelity"
+      COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "AppDataHighFidelity"
+    )
   endif()
 endif()
 
diff --git a/tools/nitpick/compiledResources/resources.rcc b/tools/nitpick/compiledResources/resources.rcc
index 29a6647b40..15f51ed7f4 100644
Binary files a/tools/nitpick/compiledResources/resources.rcc and b/tools/nitpick/compiledResources/resources.rcc differ
diff --git a/tools/nitpick/src/Nitpick.cpp b/tools/nitpick/src/Nitpick.cpp
index 0bd397715b..bff5edaf3d 100644
--- a/tools/nitpick/src/Nitpick.cpp
+++ b/tools/nitpick/src/Nitpick.cpp
@@ -38,7 +38,7 @@ Nitpick::Nitpick(QWidget* parent) : QMainWindow(parent) {
    _ui.statusLabel->setText("");
    _ui.plainTextEdit->setReadOnly(true);
 
-   setWindowTitle("Nitpick - v1.3.2");
+   setWindowTitle("Nitpick - v1.3.3");
 }
 
 Nitpick::~Nitpick() {
diff --git a/tools/nitpick/src/TestRunner.cpp b/tools/nitpick/src/TestRunner.cpp
index a895774712..8f344f3648 100644
--- a/tools/nitpick/src/TestRunner.cpp
+++ b/tools/nitpick/src/TestRunner.cpp
@@ -355,7 +355,13 @@ void TestRunner::saveExistingHighFidelityAppDataFolder() {
     }
 
     // Copy an "empty" AppData folder (i.e. no entities)
-    copyFolder(QDir::currentPath() + "/AppDataHighFidelity", _appDataFolder.path());
+    QDir canonicalAppDataFolder{ QDir::currentPath() + "/AppDataHighFidelity" };
+    if (canonicalAppDataFolder.exists()) {
+        copyFolder(canonicalAppDataFolder.path(), _appDataFolder.path());
+    } else {
+        QMessageBox::critical(0, "Internal error", "The nitpick AppData folder cannot be found at:\n" + canonicalAppDataFolder.path());
+        exit(-1);
+    }
 }
 
 void TestRunner::createSnapshotFolder() {