diff --git a/ChangeLog b/ChangeLog
index fc124abad..d5267fa9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-09-07 Holger Vogt
  * vectors.c: add plot [alli | allv | ally]
+ * com_measure2.c: prevent seg fault if wrong meas type is chosen
 
 2010-09-04 Dietmar Warning
  * misc/tilde.c: prevent unreached statement if pwd.h available
diff --git a/src/frontend/com_measure2.c b/src/frontend/com_measure2.c
index ede5550a6..ffb92862e 100644
--- a/src/frontend/com_measure2.c
+++ b/src/frontend/com_measure2.c
@@ -650,7 +650,12 @@ static void measure_minMaxAvg(
  
    for (i=0; i < d->v_length; i++) {
       if (ac_check) {
-         value = get_value(meas, d, i); //d->v_compdata[i].cx_real;
+         if (d->v_compdata)
+            value = get_value(meas, d, i); //d->v_compdata[i].cx_real;
+         else {
+            fprintf(cp_err, "Error: 'meas ac' requires complex input vector!\n");
+            return;
+         }
          svalue = dScale->v_compdata[i].cx_real;
       }
       else if (sp_check) {