diff --git a/scripts/base/files/ocsp/main.bro b/scripts/base/files/ocsp/main.bro
index 020ba096cf..551322b4bc 100644
--- a/scripts/base/files/ocsp/main.bro
+++ b/scripts/base/files/ocsp/main.bro
@@ -176,7 +176,7 @@ function update_http_info(http: HTTP::Info, req_rec: OCSP::Info_req)
 function enq_request(http: HTTP::Info, req: OCSP::Request, req_id: string, req_ts: time)
 	{
 	local index: count = 0;
-	if (req?$requestList)
+	if ( req?$requestList && |req$requestList| > 0 )
 		{
 		index += 1;
 		for (x in req$requestList)
@@ -271,6 +271,20 @@ function check_ocsp_request_uri(http: HTTP::Info): OCSP::Request
 	local uri_prefix: string = get_uri_prefix(http$original_uri);
 	local ocsp_req_str: string = http$uri[|uri_prefix|:];
 	parsed_req = ocsp_parse_request(decode_base64(ocsp_req_str));
+	if ( ! parsed_req?$requestList || |parsed_req$requestList| == 0 )
+		{
+		# normal parse fails, bug url, natively try each part
+		local w = split_string(http$original_uri, /\//);
+		local s = "";
+		for ( i in w )
+			{
+			s += "/" + w[i];
+			ocsp_req_str = http$uri[|s|:];
+			parsed_req = ocsp_parse_request(decode_base64(ocsp_req_str));
+			if ( parsed_req?$requestList && |parsed_req$requestList| > 0 )
+				break;
+			}
+		}
 	return parsed_req;
 	}
 
@@ -279,7 +293,7 @@ event ocsp_response(f: fa_file, resp_ref: opaque of ocsp_resp, resp: OCSP::Respo
 	if ( ! f?$http )
 		return;
 
-	if (resp?$responses)
+	if ( resp?$responses && |resp$responses| > 0 )
 		{
 		local index: count = 0;
 		for (x in resp$responses)
diff --git a/scripts/policy/protocols/ssl/ocsp-ssl-split.bro b/scripts/policy/protocols/ssl/ocsp-ssl-split.bro
index 2dee529cf1..69bffb19ed 100644
--- a/scripts/policy/protocols/ssl/ocsp-ssl-split.bro
+++ b/scripts/policy/protocols/ssl/ocsp-ssl-split.bro
@@ -76,6 +76,9 @@ export {
 		## HTTP request may contain several OCSP requests;
 		## this is copied from connection
 		num_ocsp:       count      &log       &optional;
+
+		## the original_uri in HTTP request
+		original_uri:   string     &log       &optional;		
 		};
 
 	type Issuer_Name_Type: record {
@@ -342,6 +345,9 @@ function update_http_info(ocsp: OCSP_SSL_SPLIT::Info_OCSP, http: HTTP::Info)
 	if ( http?$method )
 		ocsp$method = http$method;
 
+	if ( http?$original_uri )
+		ocsp$original_uri = http$original_uri;
+	
 	if ( http?$host )
 		ocsp$ocsp_uri = http$host;