diff --git a/CHANGELOG.md b/CHANGELOG.md
index 699217695..b0b0ae158 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.6.9
+- Fixed OpenComputers "unknown error" when using extract item API (raoulvdberge)
+
 ### 1.6.8
 - Fixed Ender IO incompatibility (raoulvdberge)
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java
index c65c56bfb..efecba64f 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java
@@ -270,7 +270,7 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment {
 
         // Simulate extracting the item and get the amount of items that can be extracted
         ItemStack extractedSim = node.getNetwork().extractItem(stack, count, Action.SIMULATE);
-        if (extractedSim.isEmpty() || extractedSim.getCount() == 0) {
+        if (extractedSim == null) {
             return new Object[]{null, "could not extract the specified item"};
         }
 
@@ -290,7 +290,9 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment {
 
         // Actually do it and return how many items we've inserted
         ItemStack extracted = node.getNetwork().extractItem(stack, count, Action.PERFORM);
-        ItemHandlerHelper.insertItemStacked(handler, extracted, false);
+        if (extracted != null) {
+            ItemHandlerHelper.insertItemStacked(handler, extracted, false);
+        }
 
         return new Object[]{transferableAmount};
     }