diff --git a/phpBB/admin/admin_smilies.php b/phpBB/admin/admin_smilies.php
index 6e9f9079de..4a70da9c8c 100644
--- a/phpBB/admin/admin_smilies.php
+++ b/phpBB/admin/admin_smilies.php
@@ -446,6 +446,12 @@ else if ( $mode != "" )
 			$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];
 			$smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? $HTTP_POST_VARS['smile_emotion'] : $HTTP_GET_VARS['smile_emotion'];
 
+			// If no code was entered complain ...
+			if ($smile_code == '' || $smile_url = '')
+			{
+				message_die(MESSAGE, $lang['Fields_empty']);
+			}
+
 			//
 			// Convert < and > to proper htmlentities for parsing.
 			//
@@ -545,4 +551,4 @@ else
 //
 include('./page_footer_admin.'.$phpEx);
 
-?>
\ No newline at end of file
+?>