diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py
index 00ea33b60826d6cd1e12ceafcec4b303f75842f9..7ebaefec79e5c605a0398a13064fbcef9b8c80a2 100644
--- a/src/caosdb/common/models.py
+++ b/src/caosdb/common/models.py
@@ -1388,8 +1388,8 @@ class File(Record):
 
     """
 
-    def __init__(self, name=None, id=None, description=None, # @ReservedAssignment
-                 path=None, file=None,  pickup=None, # @ReservedAssignment
+    def __init__(self, name=None, id=None, description=None,  # @ReservedAssignment
+                 path=None, file=None, pickup=None,  # @ReservedAssignment
                  thumbnail=None, from_location=None):
         Record.__init__(self, id=id, name=name, description=description)
         self.role = "File"
@@ -1404,7 +1404,7 @@ class File(Record):
 
         self.pickup = pickup
 
-        if not from_location is None:
+        if from_location is not None:
             warn(DeprecationWarning(
                 "Param `from_location` is deprecated, use `pickup instead`."))
         if self.pickup is None: