diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 713523698a..3aa1d3cc1f 100644
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -231,10 +231,12 @@ static apr_status_t uldap_connection_cleanup(void *param)
  */
 static apr_status_t util_ldap_connection_remove (void *param) { 
     util_ldap_connection_t *ldc = param, *l  = NULL, *prev = NULL;
-    util_ldap_state_t *st = ldc->st;
+    util_ldap_state_t *st;
 
     if (!ldc) return APR_SUCCESS;
 
+    st = ldc->st;
+
     uldap_connection_unbind(ldc);
 
 #if APR_HAS_THREADS
diff --git a/server/util_expr.c b/server/util_expr.c
index 3acc8a3182..6d8329dfc9 100644
--- a/server/util_expr.c
+++ b/server/util_expr.c
@@ -44,7 +44,7 @@
 } while(0)
 
 #define CREATE_NODE(pool,name) do {                          \
-    (name) = apr_pcalloc(pool, sizeof(*(name)));
+    (name) = apr_pcalloc(pool, sizeof(*(name)));             \
 } while(0)
 
 static void debug_printf(request_rec *r, const char *fmt, ...)