diff --git a/index.js b/index.js
index 8ad747c..581cb73 100644
--- a/index.js
+++ b/index.js
@@ -40,7 +40,7 @@ program
 	.command('static <domain> [outPort]')
 	.description('Create a static server at this folder.')
 	.action(function(domain, outPort="80") {
-		// stuff happens
+		if(!validate(domain, outPort))
 		createStaticServer(domain, outPort)
 	})
 
diff --git a/util/validate.js b/util/validate.js
index 6a244f8..d8a9408 100644
--- a/util/validate.js
+++ b/util/validate.js
@@ -2,7 +2,7 @@ var validator = require('validator')
 // Using Validator
 var isDomain = validator.isFQDN
 
-function validate(domain, inPort, outPort = undefined) {
+function validate(domain, inPort = undefined, outPort) {
 	var domainInvalidMsg = "\nDomain is not valid. Please use a valid domain name."
 	var portInvalidMsg = ["\nPort should be a number.", "\nPort should be a number from 1 and 65535."]
 	var validInPort = /^\d+$/.exec(inPort)
@@ -21,20 +21,20 @@ function validate(domain, inPort, outPort = undefined) {
 			console.log(portInvalidMsg[1])
 			return isTrue = false
 		}
-	} /*
+	}
 	if (typeof outPort !== undefined) {
 		if (!validInPort || !validOutPort) {
 			console.log(portInvalidMsg[0])
 			return isTrue = false
 		}
-	} */
-	if (typeof outPort !== undefined) {
-		if (!((validInPort > 0 && validInPort <= 65535) && (validOutPort > 0 && validOutPort <= 65535))) {
-			console.log(portInvalidMsg[1])
-			return isTrue = false
+		if (typeof outPort !== undefined) {
+			if (!((validInPort > 0 && validInPort <= 65535) && (validOutPort > 0 && validOutPort <= 65535))) {
+				console.log(portInvalidMsg[1])
+				return isTrue = false
+			}
 		}
+		return isTrue
 	}
-	return isTrue
 }
 
 module.exports = validate
\ No newline at end of file