diff --git a/Dockerfile b/Dockerfile
index 1d150bcdf3..a77bb0928c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,6 +28,9 @@ COPY ./docker/apache2.conf /etc/apache2/apache2.conf
 # Enable apache mod rewrite..
 RUN a2enmod rewrite
 
+# Enable apache mod ssl..
+RUN a2enmod ssl
+
 # Setup the Composer installer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
diff --git a/app/Import/Converter/Amount.php b/app/Import/Converter/Amount.php
index 1177b86a2e..bf1f23fdf9 100644
--- a/app/Import/Converter/Amount.php
+++ b/app/Import/Converter/Amount.php
@@ -36,6 +36,10 @@ class Amount implements ConverterInterface
      */
     public function convert($value): string
     {
+        if(is_null($value)) {
+            return '0';
+        }
+        $value = strval($value);
         Log::debug(sprintf('Start with amount "%s"', $value));
         $len             = strlen($value);
         $decimalPosition = $len - 3;
diff --git a/app/Import/Storage/ImportStorage.php b/app/Import/Storage/ImportStorage.php
index 75332a6d47..f0d9e3f9f4 100644
--- a/app/Import/Storage/ImportStorage.php
+++ b/app/Import/Storage/ImportStorage.php
@@ -39,11 +39,11 @@ class ImportStorage
     /** @var string */
     private $dateFormat = 'Ymd'; // yes, hard coded
     /** @var  ImportJob */
-    private $job;
+    protected $job;
     /** @var Collection */
     private $objects;
     /** @var Collection */
-    private $rules;
+    protected $rules;
 
     /** @var  array */
     private $transfers = [];
diff --git a/app/Import/Storage/ImportSupport.php b/app/Import/Storage/ImportSupport.php
index fbae32575e..80bb804ec1 100644
--- a/app/Import/Storage/ImportSupport.php
+++ b/app/Import/Storage/ImportSupport.php
@@ -35,6 +35,11 @@ use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 use Log;
 
+/**
+ * Trait ImportSupport
+ *
+ * @package FireflyIII\Import\Storage
+ */
 trait ImportSupport
 {
     /** @var int */
diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php
index 58bde274d0..84e964735c 100644
--- a/app/Repositories/Journal/JournalRepository.php
+++ b/app/Repositories/Journal/JournalRepository.php
@@ -196,7 +196,7 @@ class JournalRepository implements JournalRepositoryInterface
         $journal->save();
 
         // store stuff:
-        $this->storeCategoryWithJournal($journal, $data['category']);
+        $this->storeCategoryWithJournal($journal, strval($data['category']));
         $this->storeBudgetWithJournal($journal, $data['budget_id']);
 
         // store two transactions:
@@ -271,7 +271,7 @@ class JournalRepository implements JournalRepositoryInterface
         $journal->categories()->detach();
         $journal->budgets()->detach();
 
-        $this->storeCategoryWithJournal($journal, $data['category']);
+        $this->storeCategoryWithJournal($journal, strval($data['category']));
         $this->storeBudgetWithJournal($journal, $data['budget_id']);
 
         // negative because source loses money.
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 923a81740c..6d4caf22ba 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -474,7 +474,7 @@ return [
     'converted_to_Withdrawal'                    => 'The transaction has been converted to a withdrawal',
     'converted_to_Deposit'                       => 'The transaction has been converted to a deposit',
     'converted_to_Transfer'                      => 'The transaction has been converted to a transfer',
-
+    'invalid_convert_selection'                  => 'The account you have selected is already used in this transaction or does not exist.',
 
     // create new stuff:
     'create_new_withdrawal'                      => 'Create new withdrawal',
diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php
index f4bc60d059..8ca2fd2d9f 100644
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -186,7 +186,7 @@ return [
     'payment_date'       => 'Payment date',
     'invoice_date'       => 'Invoice date',
     'internal_reference' => 'Internal reference',
-
-    'inward'  => 'Inward description',
-    'outward' => 'Outward description',
+    'inward'             => 'Inward description',
+    'outward'            => 'Outward description',
+    'rule_group_id'      => 'Rule group',
 ];