diff --git a/core/smn_console.cpp b/core/smn_console.cpp
index dff169b1b..1070fbc4c 100644
--- a/core/smn_console.cpp
+++ b/core/smn_console.cpp
@@ -630,24 +630,26 @@ static cell_t sm_GetCmdArgs(IPluginContext *pContext, const cell_t *params)
 static cell_t sm_GetCmdArg(IPluginContext *pContext, const cell_t *params)
 {
 	const char *arg = engine->Cmd_Argv(params[1]);
+	size_t length;
 	
-	pContext->StringToLocalUTF8(params[2], params[3], arg, NULL);
+	pContext->StringToLocalUTF8(params[2], params[3], arg, &length);
 
-	return 1;
+	return (cell_t)length;
 }
 
 static cell_t sm_GetCmdArgString(IPluginContext *pContext, const cell_t *params)
 {
 	const char *args = engine->Cmd_Args();
+	size_t length;
 
 	if (!args)
 	{
 		args = "";
 	}
 
-	pContext->StringToLocalUTF8(params[1], params[2], args, NULL);
+	pContext->StringToLocalUTF8(params[1], params[2], args, &length);
 
-	return 1;
+	return (cell_t)length;
 }
 
 static cell_t sm_PrintToServer(IPluginContext *pCtx, const cell_t *params)
diff --git a/plugins/include/console.inc b/plugins/include/console.inc
index 27e9db970..8bf6c99d9 100644
--- a/plugins/include/console.inc
+++ b/plugins/include/console.inc
@@ -338,7 +338,7 @@ native GetCmdArgs();
  * @param argnum		Argument number to retrieve.
  * @param buffer		Buffer to use for storing the string.
  * @param maxlength		Maximum length of the buffer.
- * @noreturn
+ * @return				Length of string written to buffer.
  */
 native GetCmdArg(argnum, String:buffer[], maxlength);
 
@@ -348,7 +348,7 @@ native GetCmdArg(argnum, String:buffer[], maxlength);
  *
  * @param buffer		Buffer to use for storing the string.
  * @param maxlength		Maximum length of the buffer.
- * @noreturn
+ * @return				Length of string written to buffer.
  */
 native GetCmdArgString(String:buffer[], maxlength);