diff --git a/src/main/kotlin/fr/postgresjson/connexion/Connection.kt b/src/main/kotlin/fr/postgresjson/connexion/Connection.kt
index e0386f4..9614d56 100644
--- a/src/main/kotlin/fr/postgresjson/connexion/Connection.kt
+++ b/src/main/kotlin/fr/postgresjson/connexion/Connection.kt
@@ -252,7 +252,7 @@ class Connection(
             val start = System.currentTimeMillis()
             val result = callback()
             val duration = (System.currentTimeMillis() - start)
-            logger?.debug("$duration ms for query: $sqlForLog", values)
+            logger?.debug("$duration ms for query: $sqlForLog \n {}", values.joinToString(", "))
             return result
         } catch (e: Throwable) {
             logger?.info("Query Error: $sqlForLog, $values", e)
diff --git a/src/main/kotlin/fr/postgresjson/definition/Function.kt b/src/main/kotlin/fr/postgresjson/definition/Function.kt
index 1afdc7b..2d9c2f9 100644
--- a/src/main/kotlin/fr/postgresjson/definition/Function.kt
+++ b/src/main/kotlin/fr/postgresjson/definition/Function.kt
@@ -6,7 +6,7 @@ import java.io.File
 open class Function(
     override val script: String
 ): Resource, ParametersInterface {
-    val returns: String?
+    val returns: String
     override val name: String
     override val parameters: List<Parameter>
     override var source: File? = null
@@ -22,9 +22,9 @@ open class Function(
 
         val queryMatch = functionRegex.find(script)
         if (queryMatch !== null) {
-            val functionName = queryMatch.groups.get("name")?.value?.trim()
+            val functionName = queryMatch.groups.get("name")?.value?.trim() ?: error("Function name not found")
             val functionParameters = queryMatch.groups["params"]?.value?.trim()
-            this.returns = queryMatch.groups["return"]?.value?.trim()
+            this.returns = queryMatch.groups["return"]?.value?.trim() ?:""
 
             /* Create parameters definition */
             val parameters = if (functionParameters !== null) {
@@ -40,7 +40,7 @@ open class Function(
             } else {
                 listOf()
             }
-            this.name = functionName!!
+            this.name = functionName
             this.parameters = parameters
         } else {
             throw FunctionNotFound()