diff --git a/README.md b/README.md
index 281fb31..53c1c74 100644
--- a/README.md
+++ b/README.md
@@ -122,4 +122,4 @@ To see examples, look at the default templates:
 
 ## Maintainer Contact
 
-	Nathan Glasl, nathan@silverstripe.com.au
+	Nathan Glasl, nathan@symbiote.com.au
diff --git a/_config.php b/_config.php
index c0dbfa3..8e8f7d3 100644
--- a/_config.php
+++ b/_config.php
@@ -2,7 +2,7 @@
 
 /**
  *	The mediawesome specific configuration settings.
- *	@author Nathan Glasl <nathan@silverstripe.com.au>
+ *	@author Nathan Glasl <nathan@symbiote.com.au>
  */
 
 if(!defined('MEDIAWESOME_PATH')) {
diff --git a/code/dataobjects/MediaAttribute.php b/code/dataobjects/MediaAttribute.php
index 542c8ff..4c9ad63 100644
--- a/code/dataobjects/MediaAttribute.php
+++ b/code/dataobjects/MediaAttribute.php
@@ -2,7 +2,7 @@
 
 /**
  *	Mediawesome CMS attribute for a media type.
- *	@author Nathan Glasl <nathan@silverstripe.com.au>
+ *	@author Nathan Glasl <nathan@symbiote.com.au>
  */
 
 class MediaAttribute extends DataObject {
@@ -158,7 +158,7 @@ public function onBeforeWrite() {
 
 		$parameters = Controller::has_curr() ? Controller::curr()->getRequest()->requestVars() : null;
 		$matches = array();
-		if(is_array($parameters) && preg_match('#TypesAttributes/item/[0-9]*/#', $parameters['url'], $matches)) {
+		if(is_array($parameters) && isset($parameters['url']) && preg_match('#TypesAttributes/item/[0-9]*/#', $parameters['url'], $matches)) {
 			$ID = preg_replace('#[^0-9]#', '', $matches[0]);
 			$pages = MediaPage::get()->innerJoin('MediaType', 'MediaPage.MediaTypeID = MediaType.ID')->where('MediaType.ID = ' . (int)$ID);
 
diff --git a/code/dataobjects/MediaTag.php b/code/dataobjects/MediaTag.php
index a80e513..c12708a 100644
--- a/code/dataobjects/MediaTag.php
+++ b/code/dataobjects/MediaTag.php
@@ -2,7 +2,7 @@
 
 /**
  *	Mediawesome CMS tag for a media page.
- *	@author Nathan Glasl <nathan@silverstripe.com.au>
+ *	@author Nathan Glasl <nathan@symbiote.com.au>
  */
 
 class MediaTag extends DataObject {
diff --git a/code/dataobjects/MediaType.php b/code/dataobjects/MediaType.php
index 1d40d11..a7e4c94 100644
--- a/code/dataobjects/MediaType.php
+++ b/code/dataobjects/MediaType.php
@@ -2,7 +2,7 @@
 
 /**
  *	Mediawesome CMS type/category of media.
- *	@author Nathan Glasl <nathan@silverstripe.com.au>
+ *	@author Nathan Glasl <nathan@symbiote.com.au>
  */
 
 class MediaType extends DataObject {
diff --git a/code/extensions/SiteConfigMediaPermissionExtension.php b/code/extensions/SiteConfigMediaPermissionExtension.php
index d55b076..364f483 100644
--- a/code/extensions/SiteConfigMediaPermissionExtension.php
+++ b/code/extensions/SiteConfigMediaPermissionExtension.php
@@ -2,7 +2,7 @@
 
 /**
  *	Mediawesome extension which allows permission configuration for customisation of media.
- *	@author Nathan Glasl <nathan@silverstripe.com.au>
+ *	@author Nathan Glasl <nathan@symbiote.com.au>
  */
 
 class SiteConfigMediaPermissionExtension extends DataExtension {
diff --git a/code/pages/MediaHolder.php b/code/pages/MediaHolder.php
index 1f42c9e..d264003 100644
--- a/code/pages/MediaHolder.php
+++ b/code/pages/MediaHolder.php
@@ -2,7 +2,7 @@
 
 /**
  *	Displays media holder/page children, with optional date/tag filters.
- *	@author Nathan Glasl <nathan@silverstripe.com.au>
+ *	@author Nathan Glasl <nathan@symbiote.com.au>
  */
 
 class MediaHolder extends Page {
diff --git a/code/pages/MediaPage.php b/code/pages/MediaPage.php
index 9ad2f79..d08a917 100644
--- a/code/pages/MediaPage.php
+++ b/code/pages/MediaPage.php
@@ -2,7 +2,7 @@
 
 /**
  *	Displays customised media content relating to the respective media type.
- *	@author Nathan Glasl <nathan@silverstripe.com.au>
+ *	@author Nathan Glasl <nathan@symbiote.com.au>
  */
 
 class MediaPage extends Page {
diff --git a/composer.json b/composer.json
index 3286958..88530af 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
 	"license": "BSD-3-Clause",
 	"authors": [{
 		"name": "Nathan Glasl",
-		"email": "nathan@silverstripe.com.au"
+		"email": "nathan@symbiote.com.au"
 	}],
 	"require": {
 		"silverstripe/cms": "~3.2",
diff --git a/css/mediawesome.css b/css/mediawesome.css
index b9d0f05..0bec3a1 100644
--- a/css/mediawesome.css
+++ b/css/mediawesome.css
@@ -1,7 +1,7 @@
 
 /**
  *	The mediawesome specific styling.
- *	@author Nathan Glasl <nathan@silverstripe.com.au>
+ *	@author Nathan Glasl <nathan@symbiote.com.au>
  */
 
 p.mediawesome.notice,