diff --git a/src/Yam/App/Context.hs b/src/Yam/App/Context.hs
--- a/src/Yam/App/Context.hs
+++ b/src/Yam/App/Context.hs
@@ -18,6 +18,7 @@
 
 import qualified Control.Concurrent.Map as M
 import           Data.Dynamic
+import           System.Exit
 
 type YamExtension = M.Map Text Dynamic
 
@@ -73,5 +74,5 @@
 unlockExtenstion :: (MonadYamLogger m, HasYamContext m, MonadThrow m)  => m ()
 unlockExtenstion = setExtension extensionLockKey False
 
-cleanContext :: (MonadYamLogger m, HasYamContext m, MonadThrow m)  => m () -> m ()
-cleanContext action = unlockExtenstion >> action
+cleanContext :: (MonadYamLogger m, HasYamContext m, MonadMask m)  => m () -> m ()
+cleanContext action = unlockExtenstion >> action `finally` (liftIO exitSuccess)
diff --git a/yam-app.cabal b/yam-app.cabal
--- a/yam-app.cabal
+++ b/yam-app.cabal
@@ -1,5 +1,5 @@
 name:                yam-app
-version:             0.1.8
+version:             0.1.9
 synopsis:            Yam App
 description:         Base Module for Yam
 homepage:            https://github.com/leptonyu/yam/tree/master/yam-app#readme