diff --git a/ssdv.c b/ssdv.c
index 0bf17a0..a594c95 100644
--- a/ssdv.c
+++ b/ssdv.c
@@ -472,7 +472,8 @@ char ssdv_enc_get_packet(ssdv_t *s)
 			{
 				/* Marker without data */
 				s->marker_len = 0;
-				ssdv_have_marker(s);
+				r = ssdv_have_marker(s);
+				if(r != SSDV_OK) return(r);
 			}
 			else if(s->marker >= J_SOF0 && s->marker <= J_COM)
 			{
@@ -488,7 +489,8 @@ char ssdv_enc_get_packet(ssdv_t *s)
 			if((s->needbits -= 8) == 0)
 			{
 				s->marker_len -= 2;
-				ssdv_have_marker(s);
+				r = ssdv_have_marker(s);
+				if(r != SSDV_OK) return(r);
 			}
 			break;
 		
@@ -496,7 +498,8 @@ char ssdv_enc_get_packet(ssdv_t *s)
 			s->marker_data[s->marker_data_len++] = b;
 			if(s->marker_data_len == s->marker_len)
 			{
-				ssdv_have_marker_data(s);
+				r = ssdv_have_marker_data(s);
+				if(r != SSDV_OK) return(r);
 			}
 			break;