X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fdemoscenemusic%2Fdata%2FDataManager.java;h=f3d35788f2cfaee5af00bef82ef0c4a78227debb;hb=51130ce0f519aa3ac648999413e76558679ee182;hp=f5b071f6c3a1aef023ddd4d32c53b35e9192be4f;hpb=914852381662c9d29d504cf51efbd2073e32c265;p=demoscenemusic.git

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
index f5b071f..f3d3578 100644
--- a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
@@ -808,6 +808,9 @@ public class DataManager {
 	 *             if a database error occurs
 	 */
 	private <T extends Base> T loadProperties(final T object, final String table, String type) throws DatabaseException {
+		if (object == null) {
+			return null;
+		}
 		Query query = new Query(Type.SELECT, table);
 		query.addField(new Field(table + ".PROPERTY"));
 		query.addField(new Field(table + ".VALUE"));