diff --git a/common/src/main/java/com/genexus/CommonUtil.java b/common/src/main/java/com/genexus/CommonUtil.java
index 02d44a005..83b8674b7 100644
--- a/common/src/main/java/com/genexus/CommonUtil.java
+++ b/common/src/main/java/com/genexus/CommonUtil.java
@@ -854,11 +854,7 @@ public static boolean dateCompare( Date left , Date right)
    	public static int strcmp( String left ,
                              String right )
    	{
-		return Comparator.nullsFirst(String::compareTo)
-			.compare(
-				left  == null ? null : rtrim(left),
-				right == null ? null : rtrim(right)
-			);
+		return rtrim(left).compareTo(rtrim(right));
 	}
 
    	public static boolean strcmp2( String left ,
diff --git a/java/src/main/java/com/genexus/internet/HttpContext.java b/java/src/main/java/com/genexus/internet/HttpContext.java
index cf7ed307e..bde129d97 100644
--- a/java/src/main/java/com/genexus/internet/HttpContext.java
+++ b/java/src/main/java/com/genexus/internet/HttpContext.java
@@ -727,7 +727,7 @@ public String getBuildNumber(int buildN){
 	public String convertURL(String file)
 	{
 		String url = "";
-		if (file.equals(""))
+		if (file == null || file.equals(""))
 		{
 			return "";
 		}