diff --git a/pjsip/src/pjsip-simple/presence.c b/pjsip/src/pjsip-simple/presence.c
index ac344fd..d567c6f 100644
--- a/pjsip/src/pjsip-simple/presence.c
+++ b/pjsip/src/pjsip-simple/presence.c
@@ -701,7 +701,7 @@
 {
     const pj_str_t STR_MULTIPART = { "multipart", 9 };
     pjsip_ctype_hdr *ctype_hdr;
-    pj_status_t status;
+    pj_status_t status = PJ_SUCCESS;
 
     *p_st_text = NULL;
 
diff --git a/pjsip/src/test/uri_test.c b/pjsip/src/test/uri_test.c
index 7807f50..d59a136 100644
--- a/pjsip/src/test/uri_test.c
+++ b/pjsip/src/test/uri_test.c
@@ -952,6 +952,8 @@
     avg_parse = pj_elapsed_usec(&zero, &var.parse_time);
     pj_highprec_mul(avg_parse, AVERAGE_URL_LEN);
     pj_highprec_div(avg_parse, var.parse_len);
+    if (avg_parse == 0)
+        avg_parse = 1;
     avg_parse = 1000000 / avg_parse;
 
     PJ_LOG(3,(THIS_FILE, 
@@ -969,6 +971,8 @@
     avg_print = pj_elapsed_usec(&zero, &var.print_time);
     pj_highprec_mul(avg_print, AVERAGE_URL_LEN);
     pj_highprec_div(avg_print, var.parse_len);
+    if (avg_print == 0)
+        avg_print = 1;
     avg_print = 1000000 / avg_print;
 
     PJ_LOG(3,(THIS_FILE, 
@@ -986,6 +990,8 @@
     avg_cmp = pj_elapsed_usec(&zero, &var.cmp_time);
     pj_highprec_mul(avg_cmp, AVERAGE_URL_LEN);
     pj_highprec_div(avg_cmp, var.cmp_len);
+    if (avg_cmp == 0)
+        avg_cmp = 1;
     avg_cmp = 1000000 / avg_cmp;
 
     PJ_LOG(3,(THIS_FILE,