Version 5.0.0 beta 2

applications/cms/sources/Templates/Templates.php

@@ -243,35 +243,29 @@ class Templates extends ActiveRecord
 				return $templates[ $id ];
 			}
 		}
-			
-		try
-		{
-			return parent::load( $id, $idField, $extraWhereClause );
-		}
-		catch( OutOfRangeException $ex )
-		{
-			throw $ex;
-		}
+
+		return parent::load( $id, $idField, $extraWhereClause );
 	}
 	
 	/**
 	 * Make a group_name readable (Group Name)
 	 *
-	 * @param	string	$name		Group name from the database
+	 * @param	string|null	$name		Group name from the database
 	 * @return	string
 	 */
-	public static function readableGroupName( string $name ) : string
+	public static function readableGroupName( ?string $name ) : string
 	{
-		if ( $name === 'js' )
+		switch( $name )
 		{
-			return 'JS';
+			case null:
+				return '';
+			case 'js':
+				return 'JS';
+			case 'css':
+				return 'CSS';
+			default:
+				return ucwords( str_replace( array( '-', '_' ), ' ', $name ) );
 		}
-		else if ( $name === 'css' )
-		{
-			return 'CSS';
-		}
-
-		return ucwords( str_replace( array( '-', '_' ), ' ', $name ) );
 	}
 
 	/**