diff --git a/app/Helpers/Csv/Converter/CategoryId.php b/app/Helpers/Csv/Converter/CategoryId.php
index b702f91a92..f92854e463 100644
--- a/app/Helpers/Csv/Converter/CategoryId.php
+++ b/app/Helpers/Csv/Converter/CategoryId.php
@@ -16,7 +16,7 @@ class CategoryId extends BasicConverter implements ConverterInterface
     /**
      * @return Category
      */
-    public function convert(): Budget
+    public function convert(): Category
     {
         /** @var SingleCategoryRepositoryInterface $repository */
         $repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');
diff --git a/app/Helpers/Csv/Converter/CategoryName.php b/app/Helpers/Csv/Converter/CategoryName.php
index 4ec0dc0ecd..dbfcf27e9a 100644
--- a/app/Helpers/Csv/Converter/CategoryName.php
+++ b/app/Helpers/Csv/Converter/CategoryName.php
@@ -17,7 +17,7 @@ class CategoryName extends BasicConverter implements ConverterInterface
     /**
      * @return Category
      */
-    public function convert(): Budget
+    public function convert(): Category
     {
         /** @var SingleCategoryRepositoryInterface $repository */
         $repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');
diff --git a/app/Helpers/Csv/PostProcessing/Bill.php b/app/Helpers/Csv/PostProcessing/Bill.php
index 9369fc26ad..0404c719a7 100644
--- a/app/Helpers/Csv/PostProcessing/Bill.php
+++ b/app/Helpers/Csv/PostProcessing/Bill.php
@@ -20,7 +20,7 @@ class Bill implements PostProcessorInterface
     {
 
         // get bill id.
-        if (!is_null($this->data['bill'])) {
+        if (!is_null($this->data['bill']) && !is_null($this->data['bill']->id)) {
             $this->data['bill-id'] = $this->data['bill']->id;
         }