diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c
index 9d096141a4283c0ebe16ce8b09bff611038bfae2..8f823e6e2e9f19d9f4ba779ebc69644b2436f24f 100644
--- a/src/backend/commands/conversioncmds.c
+++ b/src/backend/commands/conversioncmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/conversioncmds.c,v 1.35 2008/06/19 00:46:04 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/conversioncmds.c,v 1.36 2008/11/14 17:40:56 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -82,6 +82,13 @@ CreateConversionCommand(CreateConversionStmt *stmt)
 	funcoid = LookupFuncName(func_name, sizeof(funcargs) / sizeof(Oid),
 							 funcargs, false);
 
+	/* Check it returns VOID, else it's probably the wrong function */
+	if (get_func_rettype(funcoid) != VOIDOID)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("encoding conversion function %s must return type \"void\"",
+						NameListToString(func_name))));
+
 	/* Check we have EXECUTE rights for the function */
 	aclresult = pg_proc_aclcheck(funcoid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)