diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/AssetHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/AssetHelper.php
index 262dd7e0..47248cf5 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/AssetHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/AssetHelper.php
@@ -100,8 +100,10 @@ class AssetHelper implements HelperInterface, AssetUrlGeneratorAwareInterface
     public function execute(Template $template, Context $context, $args, $source)
     {
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args)) {
-            return '';
+        if (count($parsed_args) != 1) {
+            throw new \InvalidArgumentException(
+                '"asset" helper expects exactly one argument.'
+            );
         }
         $relative_path = $context->get($parsed_args[0]);
 
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/BlockHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/BlockHelper.php
index c5527a60..0d8c6684 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/BlockHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/BlockHelper.php
@@ -42,8 +42,10 @@ class BlockHelper extends AbstractBlockHelper implements HelperInterface
     {
         // Get block name
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args)) {
-            return '';
+        if (count($parsed_args) != 1) {
+            throw new \InvalidArgumentException(
+                '"block" helper expects exactly one argument.'
+            );
         }
         $block_name = $context->get(array_shift($parsed_args));
 
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/CutStringHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/CutStringHelper.php
index 06053f2c..6863876c 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/CutStringHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/CutStringHelper.php
@@ -39,8 +39,10 @@ class CutStringHelper implements HelperInterface
     public function execute(Template $template, Context $context, $args, $source)
     {
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args) || count($parsed_args) < 2) {
-            return '';
+        if (count($parsed_args) != 2) {
+            throw new \InvalidArgumentException(
+                '"cutString" helper expects exactly two arguments.'
+            );
         }
 
         $string = $context->get($parsed_args[0]);
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/ExtendsHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/ExtendsHelper.php
index dfd4c8ba..9f40c86b 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/ExtendsHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/ExtendsHelper.php
@@ -48,8 +48,10 @@ class ExtendsHelper implements HelperInterface
     {
         // Get name of the parent template
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args)) {
-            return '';
+        if (count($parsed_args) != 1) {
+            throw new \InvalidArgumentException(
+                '"extends" helper expects exactly one argument.'
+            );
         }
         $parent_template = $context->get(array_shift($parsed_args));
 
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/FormatDateDiffHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/FormatDateDiffHelper.php
index e4f5e6fa..4a1562d3 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/FormatDateDiffHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/FormatDateDiffHelper.php
@@ -39,8 +39,10 @@ class FormatDateDiffHelper implements HelperInterface
     public function execute(Template $template, Context $context, $args, $source)
     {
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args)) {
-            return '';
+        if (count($parsed_args) != 1) {
+            throw new \InvalidArgumentException(
+                '"formatDateDiff" helper expects exactly one argument.'
+            );
         }
 
         $seconds = intval($context->get($parsed_args[0]));
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/FormatDateHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/FormatDateHelper.php
index 64ffc69f..25a3a39d 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/FormatDateHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/FormatDateHelper.php
@@ -39,8 +39,10 @@ class FormatDateHelper implements HelperInterface
     public function execute(Template $template, Context $context, $args, $source)
     {
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args)) {
-            return '';
+        if (count($parsed_args) != 1) {
+            throw new \InvalidArgumentException(
+                '"formatDate" helper expects exactly one argument.'
+            );
         }
 
         $timestamp = intval($context->get($parsed_args[0]));
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/GeneratePaginationHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/GeneratePaginationHelper.php
index ac776824..dc4b4bfa 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/GeneratePaginationHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/GeneratePaginationHelper.php
@@ -47,8 +47,10 @@ class GeneratePaginationHelper implements HelperInterface
     public function execute(Template $template, Context $context, $args, $source)
     {
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args) || count($parsed_args) < 1) {
-            return '';
+        if (count($parsed_args) < 1 || count($parsed_args) > 2) {
+            throw new \InvalidArgumentException(
+                '"generatePagination" helper expects one or two arguments.'
+            );
         }
 
         $pagination_info = $context->get($parsed_args[0]);
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfAnyHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfAnyHelper.php
index 5797bebb..fe9af273 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfAnyHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfAnyHelper.php
@@ -45,8 +45,10 @@ class IfAnyHelper implements HelperInterface
     public function execute(Template $template, Context $context, $args, $source)
     {
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args)) {
-            return '';
+        if (count($parsed_args) == 0) {
+            throw new \InvalidArgumentException(
+                '"ifAny" helper expects at least one argument.'
+            );
         }
 
         $condition = false;
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfEqualHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfEqualHelper.php
index 99ed014c..99db9855 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfEqualHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfEqualHelper.php
@@ -43,8 +43,10 @@ class IfEqualHelper implements HelperInterface
     public function execute(Template $template, Context $context, $args, $source)
     {
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args) || count($parsed_args) < 2) {
-            return '';
+        if (count($parsed_args) != 2) {
+            throw new \InvalidArgumentException(
+                '"ifEqual" helper expects exactly two arguments.'
+            );
         }
 
         $condition = ($context->get($parsed_args[0]) == $context->get($parsed_args[1]));
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfEvenHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfEvenHelper.php
index 73c2255e..c63a4ec8 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfEvenHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfEvenHelper.php
@@ -43,8 +43,10 @@ class IfEvenHelper implements HelperInterface
     public function execute(Template $template, Context $context, $args, $source)
     {
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args)) {
-            return '';
+        if (count($parsed_args) != 1) {
+            throw new \InvalidArgumentException(
+                '"ifEven" helper expects exactly one argument.'
+            );
         }
 
         $condition = ($context->get($parsed_args[0]) % 2 == 0);
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfOddHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfOddHelper.php
index 01399712..9ca5179c 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfOddHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfOddHelper.php
@@ -44,8 +44,10 @@ class IfOddHelper implements HelperInterface
     public function execute(Template $template, Context $context, $args, $source)
     {
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args)) {
-            return '';
+        if (count($parsed_args) != 1) {
+            throw new \InvalidArgumentException(
+                '"ifOdd" helper expects exactly one argument.'
+            );
         }
 
         $condition = ($context->get($parsed_args[0]) % 2 == 1);
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfOverriddenHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfOverriddenHelper.php
index cb997748..d62cd413 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfOverriddenHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/IfOverriddenHelper.php
@@ -32,7 +32,7 @@ use Handlebars\Template;
  *     The block was overridden
  *   {{else}}
  *     The block was not overridden
- *   {{/ifOverriden}}
+ *   {{/ifOverridden}}
  * </code>
  */
 class IfOverriddenHelper extends AbstractBlockHelper implements HelperInterface
@@ -44,8 +44,10 @@ class IfOverriddenHelper extends AbstractBlockHelper implements HelperInterface
     {
         // Get block name
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args)) {
-            return '';
+        if (count($parsed_args) != 1) {
+            throw new \InvalidArgumentException(
+                '"ifOverridden" helper expects exactly one argument.'
+            );
         }
         $block_name = $context->get(array_shift($parsed_args));
 
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/L10nHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/L10nHelper.php
index a2eb8dd4..57b12159 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/L10nHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/L10nHelper.php
@@ -45,8 +45,10 @@ class L10nHelper implements HelperInterface
     {
         // Check if there is at least one argument
         $parsed_arguments = $template->parseArguments($args);
-        if (empty($parsed_arguments)) {
-            return '';
+        if (count($parsed_arguments) == 0) {
+            throw new \InvalidArgumentException(
+                '"l10n" helper expects at least one argument.'
+            );
         }
 
         $text = $context->get(array_shift($parsed_arguments));
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/OverrideHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/OverrideHelper.php
index 86a74931..71595b7a 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/OverrideHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/OverrideHelper.php
@@ -48,8 +48,10 @@ class OverrideHelper extends AbstractBlockHelper implements HelperInterface
     {
         // Get block name
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args)) {
-            return '';
+        if (count($parsed_args) != 1) {
+            throw new \InvalidArgumentException(
+                '"override" helper expects exactly one argument.'
+            );
         }
         $block_name = $context->get(array_shift($parsed_args));
 
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/RepeatHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/RepeatHelper.php
index a8c9861c..489eb905 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/RepeatHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/RepeatHelper.php
@@ -39,8 +39,10 @@ class RepeatHelper implements HelperInterface
     public function execute(Template $template, Context $context, $args, $source)
     {
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args)) {
-            return '';
+        if (count($parsed_args) != 1) {
+            throw new \InvalidArgumentException(
+                '"repeat" helper expects exactly one argument.'
+            );
         }
 
         $times = intval($context->get($parsed_args[0]));
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/ReplaceHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/ReplaceHelper.php
index e2675bc0..ac7178f8 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/ReplaceHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/ReplaceHelper.php
@@ -39,8 +39,10 @@ class ReplaceHelper implements HelperInterface
     public function execute(Template $template, Context $context, $args, $source)
     {
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args) || count($parsed_args) < 2) {
-            return '';
+        if (count($parsed_args) != 2) {
+            throw new \InvalidArgumentException(
+                '"replace" helper expects exactly two arguments.'
+            );
         }
 
         $search = $context->get($parsed_args[0]);
diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/UnlessOverriddenHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/UnlessOverriddenHelper.php
index 7856e5e9..e3b4c00e 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/UnlessOverriddenHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/UnlessOverriddenHelper.php
@@ -32,7 +32,7 @@ use Handlebars\Template;
  *     The block was not overridden
  *   {{else}}
  *     The block was overridden
- *   {{/unlessOverriden}}
+ *   {{/unlessOverridden}}
  * </code>
  */
 class UnlessOverriddenHelper extends AbstractBlockHelper implements HelperInterface
@@ -44,8 +44,10 @@ class UnlessOverriddenHelper extends AbstractBlockHelper implements HelperInterf
     {
         // Get block name
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args)) {
-            return '';
+        if (count($parsed_args) != 1) {
+            throw new \InvalidArgumentException(
+                '"unlessOverridden" helper expects exactly one argument.'
+            );
         }
         $block_name = $context->get(array_shift($parsed_args));