diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
 ## Changelog
+### 0.9.1
+
+- Increase user-friendlyness of error messages: The error message returned by
+  `toHaskellFunction` hinted at the fact that the failing function is a Haskell
+  function. This is mostly unnecessary information and might have confused
+  users.
+
 ### 0.9.0
 
 - Added cabal flag to allow fully safe garbage collection: Lua garbage
diff --git a/hslua.cabal b/hslua.cabal
--- a/hslua.cabal
+++ b/hslua.cabal
@@ -1,5 +1,5 @@
 name:                   hslua
-version:                0.9.0
+version:                0.9.1
 stability:              beta
 cabal-version:          >= 1.8
 license:                MIT
diff --git a/src/Foreign/Lua/FunctionCalling.hs b/src/Foreign/Lua/FunctionCalling.hs
--- a/src/Foreign/Lua/FunctionCalling.hs
+++ b/src/Foreign/Lua/FunctionCalling.hs
@@ -107,7 +107,7 @@
 -- as Lua error.
 toHaskellFunction :: ToHaskellFunction a => a -> HaskellFunction
 toHaskellFunction a = toHsFun 1 a `catchLuaError` \err -> do
-  push ("Error while calling haskell function: " ++ show err)
+  push ("Error during function call: " ++ show err)
   fromIntegral <$> lerror
 
 -- | Create new foreign Lua function. Function created can be called
diff --git a/test/Foreign/Lua/FunctionCallingTest.hs b/test/Foreign/Lua/FunctionCallingTest.hs
--- a/test/Foreign/Lua/FunctionCallingTest.hs
+++ b/test/Foreign/Lua/FunctionCallingTest.hs
@@ -71,7 +71,7 @@
             err <- tostring (-1) <* pop 2 -- pop _HASKELLERROR
             return (unpack err)
 
-          errMsg = "Error while calling haskell function: could not read "
+          errMsg = "Error during function call: could not read "
                    ++ "argument 2: Expected a number but got a boolean"
       in assertEqual "Unexpected result" errMsg =<< runLua (catchLuaError luaOp (return . show))
     ]