Version 5.0.0 beta 5

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
 	 */