Ensured class is same when comparing values (to avoid issue comparing datetime to None - stopgap solution...)