diff --git a/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryService.java b/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryService.java
index 0e4bc45..6e4e783 100644
--- a/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryService.java
+++ b/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryService.java
@@ -1,9 +1,6 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
 
-import net.chrisrichardson.eventstore.Aggregate;
 import net.chrisrichardson.eventstore.EntityIdentifier;
-import net.chrisrichardson.eventstore.EntityNotFoundException;
-import org.springframework.dao.EmptyResultDataAccessException;
 import rx.Observable;
 
 import java.util.List;
@@ -25,10 +22,6 @@ public class AccountQueryService {
   }
 
   public Observable<List<AccountInfo>> findByCustomerId(String customerId) {
-    List<AccountInfo> result = accountInfoRepository.findByCustomerId(customerId);
-    if(result.isEmpty())
-      return Observable.error(new EmptyResultDataAccessException(1));
-    else
-      return Observable.just(result);
+      return Observable.just(accountInfoRepository.findByCustomerId(customerId));
   }
 }