diff --git a/release-packaging/Classes/FluidBufCompose.sc b/release-packaging/Classes/FluidBufCompose.sc
index 9e7c3ce..1e4a569 100644
--- a/release-packaging/Classes/FluidBufCompose.sc
+++ b/release-packaging/Classes/FluidBufCompose.sc
@@ -4,8 +4,8 @@ FluidBufCompose{
 		source = source.asUGenInput;
 		destination = destination.asUGenInput;
 
-		if(source.isNil) {Error("Invalid Buffer").format(thisMethod.name, this.class.name).throw};
-		if(destination.isNil) {Error("Invalid Buffer").format(thisMethod.name, this.class.name).throw};
+		source.isNil.if {"FluidBufCompose:  Invalid source buffer".throw};
+		destination.isNil.if {"FluidBufCompose:  Invalid destination buffer".throw};
 
 		server = server ? Server.default;
 
diff --git a/release-packaging/Classes/FluidBufHPSS.sc b/release-packaging/Classes/FluidBufHPSS.sc
index b0c53ee..6d4882f 100644
--- a/release-packaging/Classes/FluidBufHPSS.sc
+++ b/release-packaging/Classes/FluidBufHPSS.sc
@@ -8,7 +8,7 @@ FluidBufHPSS{
 		percussive = percussive.asUGenInput;
 		residual = residual.asUGenInput;
 
-		if(source.isNil) { Error("Invalid buffer").format(thisMethod.name, this.class.name).throw};
+		source.isNil.if {"FluidBufHPSS:  Invalid source buffer".throw};
 
 		server = server ? Server.default;
 		harmonic = harmonic ? -1;
diff --git a/release-packaging/Classes/FluidBufNMF.sc b/release-packaging/Classes/FluidBufNMF.sc
index 92b1f07..8b166bd 100644
--- a/release-packaging/Classes/FluidBufNMF.sc
+++ b/release-packaging/Classes/FluidBufNMF.sc
@@ -7,7 +7,7 @@ FluidBufNMF {
 		bases = bases.asUGenInput;
 		activations = activations.asUGenInput;
 
-		if(source.isNil) { Error("Invalid buffer").format(thisMethod.name, this.class.name).throw};
+		source.isNil.if {"FluidBufNMF:  Invalid source buffer".throw};
 
 		server = server ? Server.default;
 
diff --git a/release-packaging/Classes/FluidBufNoveltySlice.sc b/release-packaging/Classes/FluidBufNoveltySlice.sc
index 64bb56d..b7b934e 100644
--- a/release-packaging/Classes/FluidBufNoveltySlice.sc
+++ b/release-packaging/Classes/FluidBufNoveltySlice.sc
@@ -6,8 +6,8 @@ FluidBufNoveltySlice{
 		source = source.asUGenInput;
 		indices = indices.asUGenInput;
 
-		if(source.isNil) { Error("Invalid buffer").format(thisMethod.name, this.class.name).throw};
-		if(indices.isNil) { Error("Invalid buffer").format(thisMethod.name, this.class.name).throw};
+		source.isNil.if {"FluidBufNoveltySlice:  Invalid source buffer".throw};
+		indices.isNil.if {"FluidBufNoveltySlice:  Invalid features buffer".throw};
 
 		server = server ? Server.default;
 
diff --git a/release-packaging/Classes/FluidBufOnsetSlice.sc b/release-packaging/Classes/FluidBufOnsetSlice.sc
index 795390f..2c4dcb0 100644
--- a/release-packaging/Classes/FluidBufOnsetSlice.sc
+++ b/release-packaging/Classes/FluidBufOnsetSlice.sc
@@ -6,8 +6,8 @@ FluidBufOnsetSlice{
 		source = source.asUGenInput;
 		indices = indices.asUGenInput;
 
-		if(source.isNil) { Error("Invalid buffer").format(thisMethod.name, this.class.name).throw};
-		if(indices.isNil) { Error("Invalid buffer").format(thisMethod.name, this.class.name).throw};
+		source.isNil.if {"FluidBufOnsetSlice:  Invalid source buffer".throw};
+		indices.isNil.if {"FluidBufOnsetSlice:  Invalid features buffer".throw};
 
 		server = server ? Server.default;
 
diff --git a/release-packaging/Classes/FluidBufPitch.sc b/release-packaging/Classes/FluidBufPitch.sc
index 5780e93..566be36 100644
--- a/release-packaging/Classes/FluidBufPitch.sc
+++ b/release-packaging/Classes/FluidBufPitch.sc
@@ -6,8 +6,8 @@ FluidBufPitch{
 		source = source.asUGenInput;
 		features = features.asUGenInput;
 
-		source.isNil.if {"FluidBufSpectralShape:  Invalid source buffer".throw};
-		features.isNil.if {"FluidBufSpectralShape:  Invalid features buffer".throw};
+		source.isNil.if {"FluidBufPitch:  Invalid source buffer".throw};
+		features.isNil.if {"FluidBufPitch:  Invalid features buffer".throw};
 
 		server = server ? Server.default;
 
diff --git a/release-packaging/Classes/FluidBufSines.sc b/release-packaging/Classes/FluidBufSines.sc
index 2f1a8a3..d54520a 100644
--- a/release-packaging/Classes/FluidBufSines.sc
+++ b/release-packaging/Classes/FluidBufSines.sc
@@ -7,7 +7,7 @@ FluidBufSines{
 		sines = sines.asUGenInput;
 		residual = residual.asUGenInput;
 
-		if(source.isNil) {Error("Invalid Buffer").format(thisMethod.name, this.class.name).throw};
+		source.isNil.if {"FluidBufSines:  Invalid source buffer".throw};
 
 		server = server ? Server.default;
 		sines = sines ? -1;
diff --git a/release-packaging/Classes/FluidBufTransientSlice.sc b/release-packaging/Classes/FluidBufTransientSlice.sc
index 69e3556..f4b6d7f 100644
--- a/release-packaging/Classes/FluidBufTransientSlice.sc
+++ b/release-packaging/Classes/FluidBufTransientSlice.sc
@@ -4,8 +4,8 @@ FluidBufTransientSlice{
 		source = source.asUGenInput;
 		indices = indices.asUGenInput;
 
-		if(source.isNil) { Error("Invalid buffer").format(thisMethod.name, this.class.name).throw};
-		if(indices.isNil) { Error("Invalid buffer").format(thisMethod.name, this.class.name).throw};
+		source.isNil.if {"FluidBufNoveltySlice:  Invalid source buffer".throw};
+		indices.isNil.if {"FluidBufNoveltySlice:  Invalid features buffer".throw};
 
 		server = server ? Server.default;
 
diff --git a/release-packaging/Classes/FluidBufTransients.sc b/release-packaging/Classes/FluidBufTransients.sc
index ad817cf..7a2cad9 100644
--- a/release-packaging/Classes/FluidBufTransients.sc
+++ b/release-packaging/Classes/FluidBufTransients.sc
@@ -5,7 +5,7 @@ FluidBufTransients {
 		transients = transients.asUGenInput;
 		residual = residual.asUGenInput;
 
-		if(source.isNil) { Error("Invalid buffer").format(thisMethod.name, this.class.name).throw};
+		source.isNil.if {"FluidBufTransients:  Invalid source buffer".throw};
 
 		server = server ? Server.default;
 		transients = transients ? -1;