diff --git a/katana/__init__.py b/katana/__init__.py
index f39745a..9aed84b 100644
--- a/katana/__init__.py
+++ b/katana/__init__.py
@@ -12,4 +12,4 @@
 
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2016-2017 KUSANAGI S.L. (http://kusanagi.io)"
-__version__ = '1.0.0-beta.13'
+__version__ = '1.0.0-beta.14'
diff --git a/katana/api/action.py b/katana/api/action.py
index f168d50..d99fbc9 100644
--- a/katana/api/action.py
+++ b/katana/api/action.py
@@ -531,6 +531,11 @@ def set_return(self, value):
         version = self.get_version()
         action = self.get_action_name()
 
+        # When runnong from CLI allow any return values
+        if not self.__action_schema:
+            self.__return_value.set('return', value)
+            return self
+
         if not self.__action_schema.has_return():
             raise UndefinedReturnValueError(service, version, action)