diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java
index 118f5ebfcc..458f54f9bb 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java
@@ -58,8 +58,8 @@ public class Barista {
 					orderItem.getShots());
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
+			return null;
 		}
-		return null;
 	}
 
 	@ServiceActivator(inputChannel="coldDrinks", outputChannel="preparedDrinks")
@@ -73,8 +73,8 @@ public class Barista {
 					orderItem.getShots());
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
+			return null;
 		}
-		return null;
 	}
 
 }
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java
index 44668ac6c1..0add783842 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java
@@ -54,8 +54,8 @@ public class Barista {
 					orderItem.getShots());
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
+			return null;
 		}
-		return null;
 	}
 
 	public Drink prepareColdDrink(OrderItem orderItem) {
@@ -68,8 +68,8 @@ public class Barista {
 					orderItem.getShots());
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
+			return null;
 		}
-		return null;
 	}
 
 }