diff --git a/src/tls.c b/src/tls.c
index 5a144ee27..056ca0934 100755
--- a/src/tls.c
+++ b/src/tls.c
@@ -1699,9 +1699,10 @@ word16 TLSX_SNI_GetRequest(TLSX* extensions, byte type, void** data)
     if (sni && sni->status != WOLFSSL_SNI_NO_MATCH) {
         switch (sni->type) {
             case WOLFSSL_SNI_HOST_NAME:
-                if (data)
+                if (data) {
                     *data = sni->data.host_name;
-                return (word16)XSTRLEN((char*)*data);
+                    return (word16)XSTRLEN((char*)*data);
+                }
         }
     }