diff --git a/src/grib_accessor_class_md5.c b/src/grib_accessor_class_md5.c
index 6b5f99fdf..2a981e3ff 100644
--- a/src/grib_accessor_class_md5.c
+++ b/src/grib_accessor_class_md5.c
@@ -195,7 +195,7 @@ static int unpack_string(grib_accessor*a , char*  v, size_t *len)
     unsigned mess_len;
     unsigned char* mess;
     unsigned char* p;
-    long offset,length;
+    long offset=0, length=0;
     grib_string_list* blacklist=NULL;
     grib_accessor* b=NULL;
     int ret=0;
@@ -213,7 +213,6 @@ static int unpack_string(grib_accessor*a , char*  v, size_t *len)
     if((ret = grib_expression_evaluate_long(grib_handle_of_accessor(a),self->length,&length))
             != GRIB_SUCCESS)
         return ret;
-
     mess=(unsigned char*)grib_context_malloc(a->context,length);
     memcpy(mess,grib_handle_of_accessor(a)->buffer->data+offset,length);
     mess_len=length;
diff --git a/src/grib_accessor_class_vector.c b/src/grib_accessor_class_vector.c
index d744d70ce..ea9580ddd 100644
--- a/src/grib_accessor_class_vector.c
+++ b/src/grib_accessor_class_vector.c
@@ -151,46 +151,41 @@ typedef struct grib_accessor_abstract_vector {
 
 static void init(grib_accessor* a,const long l, grib_arguments* c)
 {
-  grib_accessor_vector* self = (grib_accessor_vector*)a;
-  int n = 0;
+    grib_accessor_vector* self = (grib_accessor_vector*)a;
+    int n = 0;
 
-  self->vector = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
-  self->index = grib_arguments_get_long(grib_handle_of_accessor(a),c,n++);
-  a->flags  |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-  a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
-  a->length=0;
+    self->vector = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
+    self->index = grib_arguments_get_long(grib_handle_of_accessor(a),c,n++);
+    a->flags  |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
+    a->length=0;
 }
 
 static int    unpack_double   (grib_accessor* a, double* val, size_t *len)
 {
-  size_t size=0;
-  double* stat;
-  grib_accessor_vector* self = (grib_accessor_vector*)a;
-  grib_accessor* va=(grib_accessor*)grib_find_accessor(grib_handle_of_accessor(a),self->vector);
-  grib_accessor_abstract_vector* v = (grib_accessor_abstract_vector*)va;
+    int err = 0;
+    size_t size=0;
+    double* stat;
+    grib_accessor_vector* self = (grib_accessor_vector*)a;
+    grib_accessor* va=(grib_accessor*)grib_find_accessor(grib_handle_of_accessor(a),self->vector);
+    grib_accessor_abstract_vector* v = (grib_accessor_abstract_vector*)va;
 
-  Assert(self->index>=0);
+    Assert(self->index>=0);
 
-  if (self->index>=v->number_of_elements) {
-    grib_context_log(a->context,GRIB_LOG_FATAL,"index=%d number_of_elements=%d for %s",self->index,v->number_of_elements,a->name);
-    Assert(self->index < v->number_of_elements);
-  }
+    if (self->index>=v->number_of_elements) {
+        grib_context_log(a->context,GRIB_LOG_FATAL,"index=%d number_of_elements=%d for %s",self->index,v->number_of_elements,a->name);
+        Assert(self->index < v->number_of_elements);
+    }
 
-  if (va->dirty) {
-    grib_get_size(grib_handle_of_accessor(a),self->vector,&size);
-    stat=(double*)grib_context_malloc_clear(a->context,sizeof(double)*size);
-    grib_unpack_double(va,stat,&size);
-    grib_context_free(a->context,stat);
-  }
+    if (va->dirty) {
+        grib_get_size(grib_handle_of_accessor(a),self->vector,&size);
+        stat=(double*)grib_context_malloc_clear(a->context,sizeof(double)*size);
+        err = grib_unpack_double(va,stat,&size);
+        grib_context_free(a->context,stat);
+        if (err) return err;
+    }
 
-  
-  *val = v->v[self->index];
-  
+    *val = v->v[self->index];
 
-
-  return GRIB_SUCCESS;
+    return err;
 }
-
-
-
-