diff --git a/hifi_qt.py b/hifi_qt.py
index df84c45ddd..e5f54ea545 100644
--- a/hifi_qt.py
+++ b/hifi_qt.py
@@ -89,9 +89,12 @@ endif()
         if not system_qt:
             if qt_found:
                 # Sanity check, ensure we have a good cmake directory
-                if not os.path.isdir(os.path.join(self.cmakePath, "Qt5")):
-                    raise Exception("Failed to find Qt5 directory under " + self.cmakePath)
-
+                qt5_dir = os.path.join(self.cmakePath, "Qt5")
+                if not os.path.isdir(qt5_dir):
+                    raise Exception("Failed to find Qt5 directory under " + self.cmakePath + ". There should be a " + qt5_dir)
+                else:
+                    print("Qt5 check passed, found " + qt5_dir)
+                    
             # I'm not sure why this is needed. It's used by hifi_singleton.
             # Perhaps it stops multiple build processes from interferring?
             lockDir, lockName = os.path.split(self.path)
diff --git a/prebuild.py b/prebuild.py
index 47ec01f8cc..34549b038c 100644
--- a/prebuild.py
+++ b/prebuild.py
@@ -138,10 +138,17 @@ def main():
 
         if qtInstallPath is not None:
             # qtInstallPath is None when we're doing a system Qt build
+            print("cmake path: " + qtInstallPath)
+            
             with hifi_singleton.Singleton(qt.lockFile) as lock:
                 with timer('Qt'):
                     qt.installQt()
                     qt.writeConfig()
+        else:
+            if (os.environ["VIRCADIA_USE_SYSTEM_QT"]):
+                print("System Qt selected")
+            else:
+                raise Exception("Internal error: System Qt not selected, but hifi_qt.py failed to return a cmake path")
 
     pm = hifi_vcpkg.VcpkgRepo(args)
     if qtInstallPath is not None: