diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.php
index d585e6714..a34de73d7 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php
@@ -59,6 +59,12 @@ class LicenseCheckinController extends Controller
         }
 
         $license = License::find($licenseSeat->license_id);
+
+        // LicenseSeat is not assigned, it can't be checked in
+        if (is_null($licenseSeat->assignedTo) && is_null($licenseSeat->asset_id)) {
+            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkin.error'));
+        }
+
         $this->authorize('checkout', $license);
 
         if (! $license->reassignable) {
diff --git a/app/Models/Loggable.php b/app/Models/Loggable.php
index 53ff279a0..d0bbd1073 100644
--- a/app/Models/Loggable.php
+++ b/app/Models/Loggable.php
@@ -93,8 +93,12 @@ trait Loggable
     {
         $settings = Setting::getSettings();
         $log = new Actionlog;
-        $log->target_type = get_class($target);
-        $log->target_id = $target->id;
+
+        if($target != null){
+            $log->target_type = get_class($target);
+            $log->target_id = $target->id;
+
+        }
 
         if (static::class == LicenseSeat::class) {
             $log->item_type = License::class;