diff --git a/lib/services/doctor-service.ts b/lib/services/doctor-service.ts
index 514614833c..556f859d04 100644
--- a/lib/services/doctor-service.ts
+++ b/lib/services/doctor-service.ts
@@ -34,12 +34,11 @@ class DoctorService implements IDoctorService {
 			await this.$analyticsService.track("DoctorEnvironmentSetup", hasWarnings ? "incorrect" : "correct");
 		}
 
-		this.printInfosCore(infos);
-
 		if (hasWarnings) {
 			this.$logger.info("There seem to be issues with your configuration.");
 		} else {
 			this.$logger.out("No issues were detected.".bold);
+			this.printInfosCore(infos);
 		}
 
 		try {
diff --git a/lib/services/versions-service.ts b/lib/services/versions-service.ts
index c46fff5793..441f17dc6f 100644
--- a/lib/services/versions-service.ts
+++ b/lib/services/versions-service.ts
@@ -100,14 +100,15 @@ class VersionsService implements IVersionsService {
 			allComponents.push(nativescriptCliInformation);
 		}
 
-		const nativescriptCoreModulesInformation: IVersionInformation = await this.getTnsCoreModulesVersion();
-		if (nativescriptCoreModulesInformation) {
-			allComponents.push(nativescriptCoreModulesInformation);
-		}
-
-		const runtimesVersions: IVersionInformation[] = await this.getRuntimesVersions();
+		if (this.projectData) {
+			const nativescriptCoreModulesInformation: IVersionInformation = await this.getTnsCoreModulesVersion();
+			if (nativescriptCoreModulesInformation) {
+				allComponents.push(nativescriptCoreModulesInformation);
+			}
 
-		allComponents = allComponents.concat(runtimesVersions);
+			const runtimesVersions: IVersionInformation[] = await this.getRuntimesVersions();
+			allComponents = allComponents.concat(runtimesVersions);
+		}
 
 		return allComponents
 			.map(componentInformation => {