diff -urpw uc_recurring.admin.inc uc_recurring.admin.inc
--- uc_recurring.admin.inc	2009-05-19 16:01:11.000000000 +0000
+++ uc_recurring.admin.inc	2009-06-12 03:48:24.000000000 +0000
@@ -52,9 +52,9 @@ function uc_recurring_admin() {
       l($fee['rfid'], 'admin/store/orders/recurring/view/fee/'. $fee['rfid']),
       l($fee['order_id'], 'admin/store/orders/'. $fee['order_id']),
       uc_price($fee['fee_amount'], $context),
-      $fee['remaining_intervals'] != NULL && $fee['remaining_intervals'] == 0 ? '-' : format_date($fee['next_charge'], 'small'),
+      $fee['remaining_intervals'] !== NULL && $fee['remaining_intervals'] == 0 ? '-' : format_date($fee['next_charge'], 'small'),
       array('data' => check_plain($fee['regular_interval']), 'nowrap' => 'nowrap'),
-      $fee['remaining_intervals'] == NULL ? t('till cancelled') : $fee['remaining_intervals'],
+      $fee['remaining_intervals'] === NULL ? t('till cancelled') : $fee['remaining_intervals'],
       $fee['remaining_intervals'] + $fee['charged_intervals'],
       array('data' => implode(' ', $ops), 'nowrap' => 'nowrap'),
     );
diff -urpw uc_recurring.module uc_recurring.module
--- uc_recurring.module	2009-06-03 03:01:39.000000000 +0000
+++ uc_recurring.module	2009-06-12 03:48:59.000000000 +0000
@@ -349,7 +349,7 @@ function uc_recurring_renew($fee) {
       if ($fee['remaining_intervals'] > 0) $fee['remaining_intervals'] -= 1;
 
       // Update the fee in the database.
-      if ($fee['remaining_intervals'] != NULL && $fee['remaining_intervals'] == 0) {
+      if ($fee['remaining_intervals'] !== NULL && $fee['remaining_intervals'] == 0) {
         $next_charge = time();
   
         // TODO: should we provide any hooks/CA here?
@@ -526,7 +526,7 @@ function uc_recurring_recurring_fee_ops(
 
   switch ($context) {
     case 'fee_admin':
-      if ($fee['remaining_intervals'] > 0 || $fee['remaining_intervals'] == NULL) {
+      if ($fee['remaining_intervals'] > 0 || $fee['remaining_intervals'] === NULL) {
         $ops[] = l(t('charge'), 'admin/store/orders/recurring/'. $fee['rfid'] .'/charge');
       }
       $ops[] = l(t('edit'), 'admin/store/orders/recurring/'. $fee['rfid'] .'/edit');
@@ -896,7 +896,7 @@ function theme_uc_recurring_user_table($
       uc_price($fee['fee_amount'], $context),
       array('data' => check_plain($fee['regular_interval']), 'nowrap' => 'nowrap'),
       format_date($fee['next_charge'], 'small'),
-      $fee['remaining_intervals'] == NULL ? t('till cancelled') : $fee['remaining_intervals'],
+      $fee['remaining_intervals'] === NULL ? t('till cancelled') : $fee['remaining_intervals'],
       array('data' => implode(' ', $ops), 'nowrap' => 'nowrap'),
     );
   }
@@ -935,7 +935,7 @@ function uc_recurring_fee_save($type, $d
       break;
 
     case 'user':
-      if ($data['remaining_intervals'] == NULL) {
+      if ($data['remaining_intervals'] === NULL) {
         $data['remaining_intervals'] = 'NULL';
       }
       else {