diff --git a/include/logging/nxscope/nxscope_chan.h b/include/logging/nxscope/nxscope_chan.h
index abd66224c..8c7fb9087 100644
--- a/include/logging/nxscope/nxscope_chan.h
+++ b/include/logging/nxscope/nxscope_chan.h
@@ -31,8 +31,6 @@
 
 #include <fixedmath.h>
 
-#include <logging/nxscope/nxscope.h>
-
 /****************************************************************************
  * Public Types
  ****************************************************************************/
diff --git a/logging/nxscope/nxscope.c b/logging/nxscope/nxscope.c
index 123ff047e..f919bf62c 100644
--- a/logging/nxscope/nxscope.c
+++ b/logging/nxscope/nxscope.c
@@ -1120,7 +1120,7 @@ int nxscope_recv(FAR struct nxscope_s *s)
 
   /* Handle frame */
 
-  ret = nxscope_recv_handle(s, frame.id, frame.dlen, frame.data);
+  ret = nxscope_recv_handle(s, frame.id, (uint16_t)frame.dlen, frame.data);
   if (ret < 0)
     {
       _err("ERROR: nxscope_recv_handle failed %d\n", ret);
diff --git a/logging/nxscope/nxscope_chan.c b/logging/nxscope/nxscope_chan.c
index 3af048c60..10c30ad25 100644
--- a/logging/nxscope/nxscope_chan.c
+++ b/logging/nxscope/nxscope_chan.c
@@ -683,8 +683,8 @@ errout:
 
 int nxscope_chan_all_en(FAR struct nxscope_s *s, bool en)
 {
-  int ret = OK;
-  int i   = 0;
+  int     ret = OK;
+  uint8_t i   = 0;
 
   DEBUGASSERT(s);
 
diff --git a/logging/nxscope/nxscope_pser.c b/logging/nxscope/nxscope_pser.c
index 89c2c74c2..1f548bb79 100644
--- a/logging/nxscope/nxscope_pser.c
+++ b/logging/nxscope/nxscope_pser.c
@@ -166,6 +166,16 @@ static int nxscope_frame_get(FAR struct nxscope_proto_s *p,
         }
     }
 
+  /* Check for no header */
+
+  if (hdr == NULL)
+    {
+      ret = -EINVAL;
+      goto errout;
+    }
+
+  /* Check for no SOF in header */
+
   if (hdr->sof != NXSCOPE_HDR_SOF)
     {
       ret = -EINVAL;