Index: C:/Users/joshuaw/Desktop/Projects/marketing_drupal/trunk/drupal/sites/all/modules/contrib/nap/nap.module
===================================================================
--- C:/Users/joshuaw/Desktop/Projects/marketing_drupal/trunk/drupal/sites/all/modules/contrib/nap/nap.module	(revision 285)
+++ C:/Users/joshuaw/Desktop/Projects/marketing_drupal/trunk/drupal/sites/all/modules/contrib/nap/nap.module	(revision 286)
@@ -157,7 +157,7 @@
        
       if (
         $user_row->expiry_date
-        && $user_row->expiry_date != '0000-00-00 00:00:00'
+        && ($user_row->expiry_date != '0000-00-00 00:00:00' && $user_row->expiry_date != NULL)
       ) {
         $user_item .= ' (' . t('expires') . ': ' . $user_row->expiry_date . ')';
       }
@@ -822,7 +822,8 @@
     $args[':uid'] = $account->uid;
     if (!variable_get('nap_revoke', 0)) {
       $sql .= " AND ("
-              . "expiry_date > :date OR expiry_date = '0000-00-00 00:00:00'"
+              . "expiry_date > :date OR expiry_date = '0000-00-00 00:00:00' "
+              . "OR expiry_date IS NULL "
               . ")";
       $args[':date'] = date('Y-m-d H:i:s');
     }
@@ -903,7 +904,7 @@
   $pdates = db_query("SELECT purchase_date
     FROM {nap_transactions} l
     INNER JOIN {nap_purchases} r ON l.txn_id = r.txn_id
-    WHERE r.expiry_date < :now OR r.expiry_date = '0000-00-00 00:00:00'", array(':now' => $now));
+    WHERE r.expiry_date < :now OR r.expiry_date = '0000-00-00 00:00:00' OR r.expiry_date IS NULL ", array(':now' => $now));
   // For each date.
   foreach ($pdates as $active_naps) {
     $last_node_id = -1;