From 99b6c412c9b2360fe078ae113430f2ddfa6b4745 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Tue, 11 Jul 2017 01:08:33 +0200
Subject: [PATCH] Fixed not being able to extract anything when connecting an
 External Storage to Storage Drawers

---
 CHANGELOG.md                                                  | 1 +
 .../integration/storagedrawers/StorageItemItemRepository.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c322b369d..19e8f52b2 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### 1.5.9
 - Fixed crash relating to MCMP (raoulvdberge)
+- Fixed not being able to extract anything when connecting an External Storage to Storage Drawers (raoulvdberge)
 
 ### 1.5.8
 - Updated Forge to 2400 (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/storagedrawers/StorageItemItemRepository.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/storagedrawers/StorageItemItemRepository.java
index a4ca9b53a..101784975 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/storagedrawers/StorageItemItemRepository.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/storagedrawers/StorageItemItemRepository.java
@@ -61,10 +61,10 @@ public class StorageItemItemRepository extends StorageItemExternal {
         IItemRepository repository = getRepositoryFromSupplier();
 
         if (repository == null) {
-            return stack;
+            return null;
         }
 
-        return repository.extractItem(stack, size, simulate, s -> API.instance().getComparer().isEqual(stack, s, flags));
+        return RSUtils.transformEmptyToNull(repository.extractItem(stack, size, simulate, s -> API.instance().getComparer().isEqual(stack, s, flags)));
     }
 
     @Override