Version 5.0.0 beta 5

applications/gallery/sources/Album/Album.php

@@ -1289,7 +1289,10 @@ class Album extends Model
 
 		if( $lastImage = $this->lastImage() AND !$lastImage->media )
 		{
-			return (string) File::get( 'gallery_Images', $lastImage->$property )->url;
+			if( $lastImage->$property )
+			{
+				return (string) File::get( 'gallery_Images', $lastImage->$property )->url;
+			}
 		}
 
 		return NULL;

applications/gallery/sources/Category/Category.php

@@ -775,7 +775,10 @@ class Category extends Model implements Permissions
 
 		if( $lastImage = $this->lastImage() )
 		{
-			return (string) File::get( 'gallery_Images', $lastImage->$property )->url;
+			if( $lastImage->$property )
+			{
+				return (string) File::get( 'gallery_Images', $lastImage->$property )->url;
+			}
 		}
 
 		return NULL;

applications/gallery/sources/Image/Image.php

@@ -414,14 +414,31 @@ Filter
 	{
 		if( isset( $this->_data['small_file_name'] ) AND $this->_data['small_file_name'] )
 		{
-			return $this->_data['small_file_name'];
+			return $this->_data['small_file_name'] ?? '';
 		}
 		else
 		{
-			return $this->masked_file_name;
+			return $this->masked_file_name ?? '';
 		}
 	}
 
+	/**
+	 * @return string
+	 */
+	public function get_masked_file_name() : string
+	{
+		/* Make sure this never returns null */
+		return $this->_data['masked_file_name'] ?? '';
+	}
+
+	/**
+	 * @return string
+	 */
+	public function get_original_file_name() : string
+	{
+		return $this->_data['original_file_name'] ?? '';
+	}
+
 	/**
 	 * @brief	Cached URLs
 	 */