diff --git a/lib/helpers/deploy-command-helper.ts b/lib/helpers/deploy-command-helper.ts
index c010c96522..ffc6ac0a89 100644
--- a/lib/helpers/deploy-command-helper.ts
+++ b/lib/helpers/deploy-command-helper.ts
@@ -51,7 +51,7 @@ export class DeployCommandHelper {
 			});
 
 		await this.$deployController.deploy({
-			buildData: this.$buildDataService.getBuildData(this.$projectData.projectDir, platform, { ...this.$options, skipWatcher: !this.$options.watch }),
+			buildData: this.$buildDataService.getBuildData(this.$projectData.projectDir, platform, { ...this.$options.argv, skipWatcher: !this.$options.watch }),
 			deviceDescriptors
 		});
 	}
diff --git a/lib/services/log-source-map-service.ts b/lib/services/log-source-map-service.ts
index 5842c87185..fb9e47c677 100644
--- a/lib/services/log-source-map-service.ts
+++ b/lib/services/log-source-map-service.ts
@@ -53,7 +53,7 @@ export class LogSourceMapService implements Mobile.ILogSourceMapService {
 	}
 
 	public replaceWithOriginalFileLocations(platform: string, messageData: string, loggingOptions: Mobile.IDeviceLogOptions): string {
-		if (!messageData || !loggingOptions.projectDir) {
+		if (!messageData || !loggingOptions || !loggingOptions.projectDir) {
 			return messageData;
 		}