diff --git a/src/devaaiStream.c b/src/devaaiStream.c
index 958482d..f4ed9c0 100644
--- a/src/devaaiStream.c
+++ b/src/devaaiStream.c
@@ -280,7 +280,8 @@ static long initRecord (dbCommon *record)
             record->name);
         return ERROR;
     }
-    return streamInitRecord (record, &aai->inp, readData, writeData);
+    return streamInitRecord (record, &aai->inp, readData, writeData) == ERROR ?
+        ERROR : OK;
 }
 
 struct {
diff --git a/src/devaaoStream.c b/src/devaaoStream.c
index 682acb9..25e59b5 100644
--- a/src/devaaoStream.c
+++ b/src/devaaoStream.c
@@ -280,7 +280,8 @@ static long initRecord (dbCommon *record)
             record->name);
         return ERROR;
     }
-    return streamInitRecord (record, &aao->out, readData, writeData);
+    return streamInitRecord (record, &aao->out, readData, writeData) == ERROR ?
+        ERROR : OK;
 }
 
 struct {
diff --git a/src/devaiStream.c b/src/devaiStream.c
index a33fad8..953645b 100644
--- a/src/devaiStream.c
+++ b/src/devaiStream.c
@@ -74,7 +74,8 @@ static long initRecord (dbCommon *record)
 {
     aiRecord *ai = (aiRecord *) record;
 
-    return streamInitRecord (record, &ai->inp, readData, writeData);
+    return streamInitRecord (record, &ai->inp, readData, writeData) == ERROR ?
+        ERROR : OK;
 }
 
 struct {
diff --git a/src/devbiStream.c b/src/devbiStream.c
index 94d6bf2..5d3c527 100644
--- a/src/devbiStream.c
+++ b/src/devbiStream.c
@@ -90,7 +90,8 @@ static long initRecord (dbCommon *record)
 {
     biRecord *bi = (biRecord *) record;
 
-    return streamInitRecord (record, &bi->inp, readData, writeData);
+    return streamInitRecord (record, &bi->inp, readData, writeData) == ERROR ?
+        ERROR : OK;
 }
 
 struct {
diff --git a/src/devcalcoutStream.c b/src/devcalcoutStream.c
index 0192b71..b884675 100644
--- a/src/devcalcoutStream.c
+++ b/src/devcalcoutStream.c
@@ -68,7 +68,8 @@ static long initRecord (dbCommon *record)
 {
     calcoutRecord *co = (calcoutRecord *) record;
 
-    return streamInitRecord (record, &co->out, readData, writeData);
+    return streamInitRecord (record, &co->out, readData, writeData) == ERROR ?
+        ERROR : OK;
 }
 
 struct {
diff --git a/src/devlonginStream.c b/src/devlonginStream.c
index 50cbe43..1689b7f 100644
--- a/src/devlonginStream.c
+++ b/src/devlonginStream.c
@@ -48,7 +48,8 @@ static long initRecord (dbCommon *record)
 {
     longinRecord *li = (longinRecord *) record;
 
-    return streamInitRecord (record, &li->inp, readData, writeData);
+    return streamInitRecord (record, &li->inp, readData, writeData) == ERROR ?
+        ERROR : OK;
 }
 
 struct {
diff --git a/src/devlongoutStream.c b/src/devlongoutStream.c
index 228b48c..c12ae8e 100644
--- a/src/devlongoutStream.c
+++ b/src/devlongoutStream.c
@@ -49,7 +49,8 @@ static long initRecord (dbCommon *record)
 {
     longoutRecord *lo = (longoutRecord *) record;
 
-    return streamInitRecord (record, &lo->out, readData, writeData);
+    return streamInitRecord (record, &lo->out, readData, writeData) == ERROR ?
+        ERROR : OK;
 }
 
 struct {
diff --git a/src/devmbbiDirectStream.c b/src/devmbbiDirectStream.c
index 4a292d3..f3f491f 100644
--- a/src/devmbbiDirectStream.c
+++ b/src/devmbbiDirectStream.c
@@ -66,7 +66,8 @@ static long initRecord (dbCommon *record)
     mbbiDirectRecord *mbbiD = (mbbiDirectRecord *) record;
 
     mbbiD->mask <<= mbbiD->shft;
-    return streamInitRecord (record, &mbbiD->inp, readData, writeData);
+    return streamInitRecord (record, &mbbiD->inp, readData, writeData) == ERROR ?
+        ERROR : OK;
 }
 
 struct {
diff --git a/src/devmbbiStream.c b/src/devmbbiStream.c
index 8f56f2f..9c7b853 100644
--- a/src/devmbbiStream.c
+++ b/src/devmbbiStream.c
@@ -114,7 +114,8 @@ static long initRecord (dbCommon *record)
     mbbiRecord *mbbi = (mbbiRecord *) record;
 
     mbbi->mask <<= mbbi->shft;
-    return streamInitRecord (record, &mbbi->inp, readData, writeData);
+    return streamInitRecord (record, &mbbi->inp, readData, writeData) == ERROR ?
+        ERROR : OK;
 }
 
 struct {
diff --git a/src/devstringinStream.c b/src/devstringinStream.c
index beef129..82e6618 100644
--- a/src/devstringinStream.c
+++ b/src/devstringinStream.c
@@ -48,7 +48,8 @@ static long initRecord (dbCommon *record)
 {
     stringinRecord *si = (stringinRecord *) record;
 
-    return streamInitRecord (record, &si->inp, readData, writeData);
+    return streamInitRecord (record, &si->inp, readData, writeData) == ERROR ?
+        ERROR : OK;
 }
 
 struct {
diff --git a/src/devstringoutStream.c b/src/devstringoutStream.c
index e5b3a12..34c94ab 100644
--- a/src/devstringoutStream.c
+++ b/src/devstringoutStream.c
@@ -48,7 +48,8 @@ static long initRecord (dbCommon *record)
 {
     stringoutRecord *so = (stringoutRecord *) record;
 
-    return streamInitRecord (record, &so->out, readData, writeData);
+    return streamInitRecord (record, &so->out, readData, writeData) == ERROR ?
+        ERROR : OK;
 }
 
 struct {
diff --git a/src/devwaveformStream.c b/src/devwaveformStream.c
index 70e0291..0f16476 100644
--- a/src/devwaveformStream.c
+++ b/src/devwaveformStream.c
@@ -271,7 +271,8 @@ static long initRecord (dbCommon *record)
 {
     waveformRecord *wf = (waveformRecord *) record;
 
-    return streamInitRecord (record, &wf->inp, readData, writeData);
+    return streamInitRecord (record, &wf->inp, readData, writeData) == ERROR ?
+        ERROR : OK;
 }
 
 struct {