diff --git a/classes/helpers/FrmFieldGridHelper.php b/classes/helpers/FrmFieldGridHelper.php
index d71340a8a2..aeb9550035 100644
--- a/classes/helpers/FrmFieldGridHelper.php
+++ b/classes/helpers/FrmFieldGridHelper.php
@@ -36,12 +36,12 @@ class FrmFieldGridHelper {
 	private $is_frm_first;
 
 	/**
-	 * @var stdClass
+	 * @var stdClass|null
 	 */
 	private $field;
 
 	/**
-	 * @var FrmFieldGridHelper
+	 * @var FrmFieldGridHelper|null
 	 */
 	private $section_helper;
 
diff --git a/classes/models/FrmFormState.php b/classes/models/FrmFormState.php
index 859de51812..a0c85e907e 100644
--- a/classes/models/FrmFormState.php
+++ b/classes/models/FrmFormState.php
@@ -14,7 +14,7 @@
 class FrmFormState {
 
 	/**
-	 * @var FrmFormState
+	 * @var FrmFormState|null
 	 */
 	private static $instance;
 
diff --git a/classes/models/FrmValidate.php b/classes/models/FrmValidate.php
index a0e3bc1911..d4a05ea878 100644
--- a/classes/models/FrmValidate.php
+++ b/classes/models/FrmValidate.php
@@ -11,7 +11,7 @@ abstract class FrmValidate {
 	protected $form_id;
 
 	/**
-	 * @var object
+	 * @var object|null
 	 */
 	protected $form;
 
@@ -30,7 +30,7 @@ public function __construct( $form_id ) {
 	}
 
 	/**
-	 * @return object Form.
+	 * @return object|null Form.
 	 */
 	protected function get_form() {
 		if ( empty( $this->form ) ) {
diff --git a/phpstan.neon b/phpstan.neon
index 53a0a6d0c3..be9d132026 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -28,8 +28,6 @@ parameters:
 		- '#only iterables are supported#'
 		- '#will always evaluate to#'
 		- '#in isset\(\) does not exist.#'
-		- '#in empty\(\) is not falsy.#'
-		- '#always exists and is not falsy.#'
 		- '#get_gateway_for_action\(\) never returns array so it can be removed from the return type#'
 		-
 			message: '#has an unused parameter#'
@@ -373,3 +371,8 @@ parameters:
 			paths:
 				- classes/helpers/FrmXMLHelper.php
 		- '#Method FrmShortcodeHelper::get_shortcode_tag\(\) should return string but returns array<string>\|string#'
+		-
+			message: '#always exists and is not falsy.#'
+			paths:
+				- classes/models/FrmAddon.php
+				- classes/views/frm-entries/errors.php
diff --git a/psalm.xml b/psalm.xml
index 0b30fa49cb..47e8356c01 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -430,6 +430,7 @@
 				<file name="classes/models/FrmEntryShortcodeFormatter.php" />
 				<file name="classes/helpers/FrmAppHelper.php" />
 				<file name="classes/controllers/FrmFormActionsController.php" />
+				<file name="classes/models/FrmFormState.php" />
 			</errorLevel>
 		</PossiblyNullReference>
 		<DeprecatedMethod>