diff --git a/lib/customer_plan.rb b/lib/customer_plan.rb
index 6c315167ac53bc4e85b1b975280db57de599c45b..af099fda69dd5f30a64b6d8678a77d54e078c39a 100644
--- a/lib/customer_plan.rb
+++ b/lib/customer_plan.rb
@@ -11,12 +11,12 @@ class CustomerPlan
 
 	def initialize(customer_id, plan: nil, expires_at: Time.now)
 		@customer_id = customer_id
-		@plan = plan
+		@plan = plan || OpenStruct.new
 		@expires_at = expires_at
 	end
 
 	def active?
-		@plan && @expires_at > Time.now
+		plan_name && @expires_at > Time.now
 	end
 
 	def bill_plan