diff --git a/acp/abbc3_module.php b/acp/abbc3_module.php
index cabdfeea..d139c295 100644
--- a/acp/abbc3_module.php
+++ b/acp/abbc3_module.php
@@ -44,6 +44,8 @@ class abbc3_module
 
 	/**
 	 * Constructor
+	 *
+	 * @throws \Exception
 	 */
 	public function __construct()
 	{
diff --git a/core/bbcodes_installer.php b/core/bbcodes_installer.php
index c9f7c298..ad706072 100644
--- a/core/bbcodes_installer.php
+++ b/core/bbcodes_installer.php
@@ -210,12 +210,7 @@ protected function update_bbcode(array $old_bbcode, array $new_bbcode)
 	 */
 	protected function add_bbcode(array $bbcode_data)
 	{
-		$bbcode_id = $this->get_max_bbcode_id() + 1;
-
-		if ($bbcode_id <= NUM_CORE_BBCODES)
-		{
-			$bbcode_id = NUM_CORE_BBCODES + 1;
-		}
+		$bbcode_id = max($this->get_max_bbcode_id(), NUM_CORE_BBCODES) + 1;
 
 		if ($bbcode_id <= BBCODE_LIMIT)
 		{