diff --git a/lib/commands/prepare.ts b/lib/commands/prepare.ts
index e96d511895..7f07f4644e 100644
--- a/lib/commands/prepare.ts
+++ b/lib/commands/prepare.ts
@@ -6,9 +6,7 @@ export class PrepareCommand implements ICommand {
 		private $platformCommandParameter: ICommandParameter) { }
 
 	execute(args: string[]): IFuture<void> {
-		return (() => {
-			this.$platformService.preparePlatform(args[0]).wait();
-		}).future<void>()();
+		return this.$platformService.preparePlatform(args[0]);
 	}
 
 	allowedParameters = [this.$platformCommandParameter];
diff --git a/lib/commands/run.ts b/lib/commands/run.ts
index 6b81087957..7bbbb1e596 100644
--- a/lib/commands/run.ts
+++ b/lib/commands/run.ts
@@ -28,7 +28,7 @@ export class RunAndroidCommand extends RunCommandBase implements ICommand {
 		private $platformsData: IPlatformsData) {
 		super($platformService);
 	}
-
+	
 	public allowedParameters: ICommandParameter[] = [];
 
 	public execute(args: string[]): IFuture<void> {
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
index e47f318a92..cd56ec2a34 100644
--- a/lib/services/platform-service.ts
+++ b/lib/services/platform-service.ts
@@ -146,6 +146,8 @@ export class PlatformService implements IPlatformService {
 
 	public preparePlatform(platform: string): IFuture<void> {
 		return (() => {
+			this.validatePlatform(platform);
+			
 			platform = platform.toLowerCase();
 
 			var platformData = this.$platformsData.getPlatformData(platform);