diff --git a/html/typo3conf/ext/ter/Classes/Exception/NoUploadCommentException.php b/html/typo3conf/ext/ter/Classes/Exception/NoUploadCommentException.php
new file mode 100644
index 0000000000000000000000000000000000000000..36c6f203acdcdfcc97d8342dd48e1aa933c520e3
--- /dev/null
+++ b/html/typo3conf/ext/ter/Classes/Exception/NoUploadCommentException.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace T3o\Ter\Exception;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+class NoUploadCommentException extends Exception
+{
+}
diff --git a/html/typo3conf/ext/ter/class.tx_ter_api.php b/html/typo3conf/ext/ter/class.tx_ter_api.php
index f80c9e08c57255174b4da1b52f8cedea8c9f014b..28be49bd7df96488e6af8b1bdf2bb2681c678963 100755
--- a/html/typo3conf/ext/ter/class.tx_ter_api.php
+++ b/html/typo3conf/ext/ter/class.tx_ter_api.php
@@ -169,6 +169,13 @@ class tx_ter_api
             );
         }
 
+        if ((string)$extensionInfoData->infoData->uploadComment === '') {
+            throw new \T3o\Ter\Exception\NoUploadCommentException(
+                'You need to set an upload comment!',
+                TX_TER_ERROR_UPLOADEXTENSION_NOUPLOADCOMMENT
+            );
+        }
+
         if (($typo3DependencyCheck = static::checkExtensionDependencyOnSupportedTypo3Version($extensionInfoData)) !== true && $uploadUserRecordArr['admin'] !== true) {
             switch ($typo3DependencyCheck) {
                 case TX_TER_ERROR_UPLOADEXTENSION_TYPO3DEPENDENCYINCORRECT:
@@ -982,7 +989,7 @@ class tx_ter_api
         $extensionDetailsRow = [
             'pid' => (int)$this->parentObj->extensionsPID,
             'extensionuid' => (int)$extensionUid,
-            'uploadcomment' => $extensionInfoData->infoData->uploadComment,
+            'uploadcomment' => (string)$extensionInfoData->infoData->uploadComment,
             'lastuploadbyusername' => $accountData->username,
             'lastuploaddate' => $GLOBALS['SIM_EXEC_TIME'],
             'datasize' => $extensionInfoData->infoData->dataSize,
diff --git a/html/typo3conf/ext/ter/class.tx_ter_helper.php b/html/typo3conf/ext/ter/class.tx_ter_helper.php
index 3d299c132adf535992cadd147715bbc791016dac..e96c2078bf2c65ad9be6a79e47c4ca9d4ae933a1 100755
--- a/html/typo3conf/ext/ter/class.tx_ter_helper.php
+++ b/html/typo3conf/ext/ter/class.tx_ter_helper.php
@@ -62,6 +62,7 @@ define('TX_TER_ERROR_UPLOADEXTENSION_ACCESSDENIED', '208');
 define('TX_TER_ERROR_UPLOADEXTENSION_TYPO3DEPENDENCYINCORRECT', '209');
 define('TX_TER_ERROR_UPLOADEXTENSION_TYPO3DEPENDENCYCHECKFAILED', '210');
 define('TX_TER_ERROR_UPLOADEXTENSION_EXTENSIONVERSIONEXISTS', '211');
+define('TX_TER_ERROR_UPLOADEXTENSION_NOUPLOADCOMMENT', '212');
 
 define('TX_TER_ERROR_REGISTEREXTENSIONKEY_DBERRORWHILEINSERTINGKEY', '300');