diff --git a/lib/view/sfViewCacheManager.class.php b/lib/view/sfViewCacheManager.class.php
index bfbc78119..2ccaa0139 100644
--- a/lib/view/sfViewCacheManager.class.php
+++ b/lib/view/sfViewCacheManager.class.php
@@ -439,9 +439,11 @@ public function remove($internalUri, $hostName = '', $vary = '', $contextualPref
         if (strpos($cacheKey, '*')) {
             return $this->cache->removePattern($cacheKey);
         }
-        if ($this->cache->has($cacheKey)) {
-            return $this->cache->remove($cacheKey);
+        if (!$this->cache->has($cacheKey)) {
+            return true;
         }
+
+        return $this->cache->remove($cacheKey);
     }
 
     /**
diff --git a/lib/view/sfViewParameterHolder.class.php b/lib/view/sfViewParameterHolder.class.php
index deac048d5..6461c82d6 100644
--- a/lib/view/sfViewParameterHolder.class.php
+++ b/lib/view/sfViewParameterHolder.class.php
@@ -77,6 +77,8 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = [], $opt
 
         $this->setEscaping(isset($options['escaping_strategy']) ? $options['escaping_strategy'] : false);
         $this->setEscapingMethod(isset($options['escaping_method']) ? $options['escaping_method'] : 'ESC_SPECIALCHARS');
+
+        return true;
     }
 
     /**