diff --git a/include/Zend/Json.php b/include/Zend/Json.php
index df1dda76c8b07941e46cf1b3f0b9ce4556485aa1..cd2a54fd4b33ab8ed0738f4e4060edb48c646b6f 100644
--- a/include/Zend/Json.php
+++ b/include/Zend/Json.php
@@ -56,7 +56,7 @@ class Zend_Json
     public static function decode($encodedValue, $objectDecodeType = Zend_Json::TYPE_ARRAY)
     {
         if (function_exists('json_decode') && self::$useBuiltinEncoderDecoder !== true) {
-            return json_decode($encodedValue, $objectDecodeType);
+            return $encodedValue != null ? json_decode($encodedValue, $objectDecodeType) : $encodedValue;
         }
 
         require_once 'include/Zend/Json/Decoder.php';
diff --git a/include/events/VTEventHandler.inc b/include/events/VTEventHandler.inc
index 874f64b9f9c5acdd50b5bb4e860eca96d4cf97b3..9caa0e50a7475dba9dcd3a2cafea1fbed2125051 100644
--- a/include/events/VTEventHandler.inc
+++ b/include/events/VTEventHandler.inc
@@ -8,7 +8,8 @@
  * All Rights Reserved.
  *************************************************************************************/
 
+    #[\AllowDynamicProperties]
 	abstract class VTEventHandler{
 		public abstract function handleEvent($name, $data);
 	}
-?>
\ No newline at end of file
+?>