diff --git a/src/util-radix-tree.c b/src/util-radix-tree.c
index 460e7c6250..cf7b966fbd 100644
--- a/src/util-radix-tree.c
+++ b/src/util-radix-tree.c
@@ -248,12 +248,19 @@ static SCRadixPrefix *SCRadixCreatePrefix(uint8_t *key_stream,
 
     memcpy(prefix->stream, key_stream, key_bitlen / 8);
     prefix->bitlen = key_bitlen;
+
     prefix->user_data = SCRadixAllocSCRadixUserData(netmask, user);
+    if (prefix->user_data == NULL) {
+        goto error;
+    }
 
     return prefix;
 
 error:
     if (prefix != NULL) {
+        if (prefix->stream != NULL) {
+            SCFree(prefix->stream);
+        }
         SCFree(prefix);
     }
 
@@ -1451,7 +1458,7 @@ static inline SCRadixNode *SCRadixFindKeyIPNetblock(SCRadixPrefix *prefix,
 static SCRadixNode *SCRadixFindKey(uint8_t *key_stream, uint16_t key_bitlen,
                                    SCRadixTree *tree, int exact_match)
 {
-    if (tree == NULL)
+    if (tree == NULL || tree->head == NULL)
         return NULL;
 
     SCRadixNode *node = tree->head;
@@ -1459,9 +1466,6 @@ static SCRadixNode *SCRadixFindKey(uint8_t *key_stream, uint16_t key_bitlen,
     int mask = 0;
     int bytes = 0;
 
-    if (tree->head == NULL)
-        return NULL;
-
     if ( (prefix = SCRadixCreatePrefix(key_stream, key_bitlen, NULL, 255)) == NULL)
         return NULL;