diff --git a/distrho/src/DistrhoPluginVST3.cpp b/distrho/src/DistrhoPluginVST3.cpp
index 0257c14f..b1ec2ea8 100644
--- a/distrho/src/DistrhoPluginVST3.cpp
+++ b/distrho/src/DistrhoPluginVST3.cpp
@@ -2056,11 +2056,17 @@ public:
        #if DISTRHO_PLUGIN_WANT_STATE
         if (std::strcmp(msgid, "state-set") == 0)
         {
+            const v3_result res = notify_state(attrs);
+
            #if DPF_VST3_USES_SEPARATE_CONTROLLER
+            if (res != V3_OK)
+                return res;
+
+            // notify component of the change
             DISTRHO_SAFE_ASSERT_RETURN(fConnectionFromCompToCtrl != nullptr, V3_INTERNAL_ERR);
             return v3_cpp_obj(fConnectionFromCompToCtrl)->notify(fConnectionFromCompToCtrl, message);
            #else
-            return notify_state(attrs);
+            return res;
            #endif
         }
        #endif
diff --git a/distrho/src/DistrhoUIVST3.cpp b/distrho/src/DistrhoUIVST3.cpp
index f6697f2e..34cac156 100644
--- a/distrho/src/DistrhoUIVST3.cpp
+++ b/distrho/src/DistrhoUIVST3.cpp
@@ -160,8 +160,8 @@ public:
         );
 
         char suffix[9];
-        std::snprintf(suffix, 8, "%08x", std::rand());
-        suffix[8] = '\0';
+        std::snprintf(suffix, sizeof(suffix), "%08x", std::rand());
+        suffix[sizeof(suffix)-1] = '\0';
         fTimerWindowClassName += suffix;
 
         WNDCLASSEX cls;