diff --git a/aurora/models/change.py b/aurora/models/change.py
index 029f76b..0c7148a 100644
--- a/aurora/models/change.py
+++ b/aurora/models/change.py
@@ -4,9 +4,9 @@ from typing import Literal, Optional
 
 from redbot.core.bot import Red
 
-from ..models.base import AuroraBaseModel
-from ..models.partials import PartialUser
 from ..utilities.logger import logger
+from .base import AuroraBaseModel
+from .partials import PartialUser
 
 
 class Change(AuroraBaseModel):
diff --git a/aurora/models/moderation.py b/aurora/models/moderation.py
index a5c6fc0..c216218 100644
--- a/aurora/models/moderation.py
+++ b/aurora/models/moderation.py
@@ -8,11 +8,11 @@ import discord
 from discord import NotFound
 from redbot.core.bot import Red
 
-from ..models.base import AuroraGuildModel
-from ..models.change import Change
-from ..models.partials import PartialChannel, PartialRole, PartialUser
 from ..utilities.logger import logger
 from ..utilities.utils import get_next_case_number
+from .base import AuroraGuildModel
+from .change import Change
+from .partials import PartialChannel, PartialRole, PartialUser
 
 
 class Moderation(AuroraGuildModel):
@@ -241,7 +241,10 @@ class Moderation(AuroraGuildModel):
         elif not isinstance(timestamp, datetime):
             timestamp = datetime.fromtimestamp(timestamp)
 
-        if duration != "NULL" and duration is not None:
+        if duration == "NULL":
+            duration = None
+
+        if duration is not None:
             end_timestamp = timestamp + duration
         else:
             duration = None
diff --git a/aurora/models/partials.py b/aurora/models/partials.py
index 0402e88..4b9e2b6 100644
--- a/aurora/models/partials.py
+++ b/aurora/models/partials.py
@@ -1,7 +1,7 @@
 from discord import Forbidden, HTTPException, InvalidData, NotFound
 from redbot.core.bot import Red
 
-from ..models.base import AuroraBaseModel, AuroraGuildModel
+from .base import AuroraBaseModel, AuroraGuildModel
 
 
 class PartialUser(AuroraBaseModel):