diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py
index 6825823f75..43593d3283 100644
--- a/InvenTree/stock/models.py
+++ b/InvenTree/stock/models.py
@@ -453,8 +453,11 @@ class StockItem(MPTTModel):
 
         super().clean()
 
-        self.serial = self.serial.strip()
-        self.batch = self.batch.strip()
+        if self.serial is not None and type(self.serial) is str:
+            self.serial = self.serial.strip()
+
+        if self.batch is not None and type(self.batch) is str:
+            self.batch = self.batch.strip()
 
         try:
             if self.part.trackable: