From 0ca9ec769c90022f6202995d3c03b793aaf50f90 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Mon, 30 Jul 2018 16:57:59 +0000
Subject: [PATCH] Added a None guard for the person merge last_login date
 comparison.  Fixes issue #2562  - Legacy-Id: 15418

---
 ietf/person/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/person/views.py b/ietf/person/views.py
index 1821799ae..da7b2f960 100644
--- a/ietf/person/views.py
+++ b/ietf/person/views.py
@@ -92,7 +92,7 @@ def merge(request):
                 target = form.cleaned_data.get('target')
                 if source.user and target.user:
                     warn_messages.append('WARNING: Both Person records have logins.  Be sure to specify the record to keep in the Target field.')
-                    if source.user.last_login > target.user.last_login:
+                    if source.user.last_login and target.user.last_login and source.user.last_login > target.user.last_login:
                         warn_messages.append('WARNING: The most recently used login is being deleted!')
                 change_details = handle_users(source, target, check_only=True)
                 method = 'post'