diff --git a/src/main/java/com/cx/restclient/ast/AstScaClient.java b/src/main/java/com/cx/restclient/ast/AstScaClient.java
index 9dc32594..f50ec9b1 100644
--- a/src/main/java/com/cx/restclient/ast/AstScaClient.java
+++ b/src/main/java/com/cx/restclient/ast/AstScaClient.java
@@ -327,6 +327,7 @@ public Results waitForScanResults() {
         	log.error(e.getMessage());
             scaResults = new AstScaResults();
         	scaResults.setException(new CxClientException(e));
+        	return scaResults;
         } 
         return new AstScaResults();
        // return scaResults;
diff --git a/src/main/java/com/cx/restclient/httpClient/CxHttpClient.java b/src/main/java/com/cx/restclient/httpClient/CxHttpClient.java
index 7fe0ed96..5221b01e 100644
--- a/src/main/java/com/cx/restclient/httpClient/CxHttpClient.java
+++ b/src/main/java/com/cx/restclient/httpClient/CxHttpClient.java
@@ -643,8 +643,15 @@ private <T> T request(HttpRequestBase httpMethod, String contentType, HttpEntity
             URI tmpUri = httpMethod.getURI();
             String host = StringUtils.isNotEmpty(tmpUri.getAuthority()) ? tmpUri.getAuthority() : tmpUri.getHost();
             host = IDN.toASCII(host, IDN.ALLOW_UNASSIGNED);
+            String hostname = host;
+            String portNumber = "" + tmpUri.getPort();
+            String[] arr = host.split(":");
+            if(arr != null && arr.length>1) {
+            	hostname = arr[0];
+            	portNumber = arr[1];
+            }
             try {               
-                URIBuilder uriBuilder = new URIBuilder(tmpUri).setHost(host);
+                URIBuilder uriBuilder = new URIBuilder(tmpUri).setHost(hostname).setPort(Integer.parseInt(portNumber));
                 URI uri = uriBuilder.build();
                 httpMethod.setURI(uri);
             } catch (URISyntaxException e) {
diff --git a/src/main/java/com/cx/restclient/sast/utils/SASTUtils.java b/src/main/java/com/cx/restclient/sast/utils/SASTUtils.java
index 2e67ae45..c9d6629f 100644
--- a/src/main/java/com/cx/restclient/sast/utils/SASTUtils.java
+++ b/src/main/java/com/cx/restclient/sast/utils/SASTUtils.java
@@ -62,10 +62,9 @@ public static void printSASTResultsToConsole(CxScanConfig config, SASTResults sa
 				
 		        String cxOrigin = config.getCxOrigin();				
         
-				if(cxOrigin != null && cxOrigin.equals("cx-CLI") && currentVersionFloat < Float.parseFloat("9.7")){
-					
+				if(currentVersionFloat < Float.parseFloat("9.7")){
 					if(config.getSastCriticalThreshold() != null && config.getSastCriticalThreshold() != 0) {
-						log.warn("-SASTCritical parameter only works with SAST >= 9.7");        	
+						log.warn("SAST Critical Threshold is not supported for SAST versions prior to 9.7");        	
 					}
 				}