diff --git a/src/inport/TaskCase.java b/src/inport/TaskCase.java
index f33dac624c553d8ebaa115d007c7a92522e96b9f..fb6cb99a07c61b5b5af42b2982c30241efc54676 100644
--- a/src/inport/TaskCase.java
+++ b/src/inport/TaskCase.java
@@ -718,7 +718,11 @@ public class TaskCase {
                             {
                                 String[] items = rStr.substring(0, rStr.indexOf('[')).split(" ");
 
-                                op.setExecutor(m_vessel.get(Integer.valueOf(items[0].trim())));
+                                MovingObject ex = m_vessel.get(Integer.valueOf(items[0].trim()));
+                                if (ex == null) {
+                                    ex = m_bunker.get(Integer.valueOf(items[0].trim()));
+                                }
+                                op.setExecutor(ex);
                                 if (items.length > 1) {
                                     op.setBunker(Optional.of(m_bunker.get(Integer.valueOf(items[1].trim()))));
                                 }