Added proper customerID check