diff --git a/lib/customer_info_form.rb b/lib/customer_info_form.rb
index edb066f84cc81dcf9c6dde2235ae841a8f40d9a7..b4db45e16d3fb658694e60e1d7f526316b2091d3 100644
--- a/lib/customer_info_form.rb
+++ b/lib/customer_info_form.rb
@@ -28,6 +28,8 @@ class CustomerInfoForm
 	end
 
 	def parse_something(value)
+		return EMPromise.resolve(NoCustomer.new) if value.to_s.empty?
+
 		EMPromise.all([
 			find_customer_one(value),
 			find_customer_one(Blather::JID.new(value)),