diff --git a/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php b/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php
index a4f13f6a..441b5c76 100644
--- a/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php
+++ b/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php
@@ -66,6 +66,7 @@ class DedimaniaPlugin implements CallbackListener, CommandListener, TimerListene
 	 */
 	/** @var ManiaControl $maniaControl */
 	private $maniaControl = null;
+	// TODO: there are several spots where $dedimaniaData is null - fix those (look for !$this->dedimaniaData)
 	/** @var DedimaniaData $dedimaniaData */
 	private $dedimaniaData = null;
 	private $updateManialink = false;
@@ -841,6 +842,9 @@ class DedimaniaPlugin implements CallbackListener, CommandListener, TimerListene
 	 * @param RecordCallback $callback
 	 */
 	public function handleFinishCallback(RecordCallback $callback) {
+		if (!$this->dedimaniaData || !$this->dedimaniaData->records) {
+			return;
+		}
 		if ($callback->isLegacyCallback) {
 			return;
 		}