diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 1121dd9e5..a5e2ac8fa 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -568,7 +568,7 @@ class Asset extends Depreciable
      */
     public function assignedType()
     {
-        return strtolower(class_basename($this->assigned_type));
+        return $this->assigned_type ? strtolower(class_basename($this->assigned_type)) : null;
     }
 
 
diff --git a/app/Models/Depreciable.php b/app/Models/Depreciable.php
index cfc42aa94..721135873 100644
--- a/app/Models/Depreciable.php
+++ b/app/Models/Depreciable.php
@@ -173,10 +173,14 @@ class Depreciable extends SnipeModel
 
     public function depreciated_date()
     {
-        $date = date_create($this->purchase_date);
-        date_add($date, date_interval_create_from_date_string($this->get_depreciation()->months.' months'));
+        if (($this->purchase_date) && ($this->get_depreciation())) {
+            $date = date_create($this->purchase_date);
+
+            return date_add($date, date_interval_create_from_date_string($this->get_depreciation()->months.' months'));//date_format($date, 'Y-m-d'); //don't bake-in format, for internationalization
+        }
+
+        return null;
 
-        return $date; //date_format($date, 'Y-m-d'); //don't bake-in format, for internationalization
     }
 
     // it's necessary for unit tests