diff --git a/app/Http/Controllers/BotController.php b/app/Http/Controllers/BotController.php
index b84527c63f95..87ddab7baa79 100644
--- a/app/Http/Controllers/BotController.php
+++ b/app/Http/Controllers/BotController.php
@@ -11,7 +11,8 @@ class BotController extends Controller
     public function handleMessage($platform)
     {
         $to = '29:1C-OsU7OWBEDOYJhQUsDkYHmycOwOq9QOg5FVTwRX9ts';
-        $message = 'add 8 tickets';
+        //$message = 'create a new invoice for Jenifer Altenwerth ';
+        $message = 'add 2 items';
         //$message = view('bots.skype.message', ['message' => $message])->render();
         //return $this->sendResponse($to, $message);
 
@@ -77,7 +78,7 @@ class BotController extends Controller
         $data = file_get_contents($url);
         $data = json_decode($data);
 
-        var_dump($data->compositeEntities);
+        var_dump($data);
 
         return $data;
     }
diff --git a/app/Ninja/Intents/BaseIntent.php b/app/Ninja/Intents/BaseIntent.php
index 7712692c72a1..222cb1d3d9a6 100644
--- a/app/Ninja/Intents/BaseIntent.php
+++ b/app/Ninja/Intents/BaseIntent.php
@@ -101,6 +101,10 @@ class BaseIntent
 
         $invoiceItems = [];
 
+        if ( ! isset($this->data->compositeEntities) || ! count($this->data->compositeEntities)) {
+            return [];
+        }
+
         foreach ($this->data->compositeEntities as $entity) {
             if ($entity->parentType == 'InvoiceItem') {
                 $product = false;
diff --git a/app/Ninja/Intents/CreateInvoiceItemsIntent.php b/app/Ninja/Intents/CreateInvoiceItemsIntent.php
index 2b97bcac1230..174f1f262542 100644
--- a/app/Ninja/Intents/CreateInvoiceItemsIntent.php
+++ b/app/Ninja/Intents/CreateInvoiceItemsIntent.php
@@ -32,7 +32,7 @@ class CreateInvoiceItemsIntent extends BaseIntent
             return $item['public_id'];
         }, $invoiceItems);
 
-        $this->setState(ENTITY_INVOICE_ITEM, [$invoiceItemId]);
+        $this->setState(ENTITY_INVOICE_ITEM, $invoiceItemIds);
 
         return view('bots.skype.invoice', [
                 'invoice' => $invoice
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 0249f764b625..fd7869856386 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -262,6 +262,7 @@ class InvoiceRepository extends BaseRepository
 
         if ($invoice) {
             // do nothing
+            $entityType = $invoice->getEntityType();
         } elseif ($isNew) {
             $entityType = ENTITY_INVOICE;
             if (isset($data['is_recurring']) && filter_var($data['is_recurring'], FILTER_VALIDATE_BOOLEAN)) {