diff --git a/system/user/addons/wiki/Model/Wiki.php b/system/user/addons/wiki/Model/Wiki.php
index 9619305..dee0c4b 100644
--- a/system/user/addons/wiki/Model/Wiki.php
+++ b/system/user/addons/wiki/Model/Wiki.php
@@ -110,6 +110,10 @@ public function validateEmails($key, $value, $params, $rule)
 	
 	public function validateShortName($key, $value, $params, $rule)
 	{
+		if (empty($value)) {
+			return '';
+		}		
+		
 		if (preg_match('/[^a-z0-9\-\_]/i', $value))
 		{
 			return 'invalid_short_name';
diff --git a/system/user/addons/wiki/Model/WikiNamespace.php b/system/user/addons/wiki/Model/WikiNamespace.php
index bf23634..883a397 100644
--- a/system/user/addons/wiki/Model/WikiNamespace.php
+++ b/system/user/addons/wiki/Model/WikiNamespace.php
@@ -48,7 +48,7 @@ class WikiNamespace extends Model {
 
 	protected static $_validation_rules = array(
 		'namespace_name' => 'required|validateShortName|uniqueWithinSiblings[Wiki,WikiNamespaces]',
-		'namespace_label'       => 'required|uniqueWithinSiblings[Wiki,WikiNamespaces]]'
+		'namespace_label'       => 'required|uniqueWithinSiblings[Wiki,WikiNamespaces]'
 	);
 
 
diff --git a/system/user/addons/wiki/addon.setup.php b/system/user/addons/wiki/addon.setup.php
index bcc6a1f..d728c50 100644
--- a/system/user/addons/wiki/addon.setup.php
+++ b/system/user/addons/wiki/addon.setup.php
@@ -5,7 +5,7 @@
 	'author_url'  => 'https://expressionengine.com/',
 	'name'        => 'Wiki',
 	'description' => '',
-	'version'     => '5.0.0',
+	'version'     => '5.0.1',
 	'namespace'   => 'User\Addons\Wiki',
 	'settings_exist' => TRUE,
 	'docs_url'    => 'https://github.com/EllisLab/Wiki/wiki',
diff --git a/system/user/addons/wiki/mod.wiki.php b/system/user/addons/wiki/mod.wiki.php
index aa16e73..776739a 100644
--- a/system/user/addons/wiki/mod.wiki.php
+++ b/system/user/addons/wiki/mod.wiki.php
@@ -51,6 +51,7 @@ class Wiki {
 	// Settings
 	var $wiki_id				= 1;
 	var $label_name				= 'EE Wiki';
+	var $short_name				= 'ee_wiki';
 	var $use_captchas 			= 'n';
 	var $text_format			= 'xhtml';
 	var $html_format			= 'safe';
@@ -655,7 +656,7 @@ function _fetch_template($which)
 	/**  Redirect for the Wiki
 	/** ----------------------------------------*/
 
-	public function redirect($namespace='', $title)
+	public function redirect($namespace='', $title='')
 	{
 		ee()->functions->redirect($this->create_url($namespace, $title));
 		exit;
@@ -667,8 +668,10 @@ public function redirect($namespace='', $title)
 	/**  Creat URL for the Wiki
 	/** ----------------------------------------*/
 
-	function create_url($namespace='', $title)
+	function create_url($namespace='', $title='')
 	{
+		if ($title == '') { return ''; }
+		
 		if ($namespace == '' && stristr($title, ':') && count($this->namespaces) > 0)
 		{
 			foreach($this->namespaces as $possible)
@@ -720,6 +723,10 @@ function prep_screen_name($str)
 
 	function prep_title($str)
 	{
+		if (empty($str)) {
+			return '';
+		}		
+		
 		if (ee()->config->item('word_separator') == 'dash')
 		{
 			return str_replace(array('-', $this->cats_separator), array(' ', $this->cats_display_separator), $str);
@@ -738,6 +745,10 @@ function prep_title($str)
 
 	public function valid_title($str)
 	{
+		if (empty($str)) {
+			return '';
+		}
+		
 		// Remove all numeric entities
 		$str = preg_replace('/&#x([0-9a-f]{2,5});{0,1}|&#([0-9]{2,4});{0,1}/', '', $str);
 
diff --git a/system/user/addons/wiki/upd.wiki.php b/system/user/addons/wiki/upd.wiki.php
index 8f0d7ae..bb669a4 100644
--- a/system/user/addons/wiki/upd.wiki.php
+++ b/system/user/addons/wiki/upd.wiki.php
@@ -24,7 +24,7 @@
  */
 class Wiki_upd {
 
-	var $version = '5.0.0';
+	var $version = '5.0.1';
 
 	/**
 	 * Module Installer