diff --git a/lib/vcap/request.rb b/lib/vcap/request.rb
index <HASH>..<HASH> 100644
--- a/lib/vcap/request.rb
+++ b/lib/vcap/request.rb
@@ -8,8 +8,7 @@ module VCAP
       end
 
       def current_id
-        Thread.current[:vcap_request_id] or
-          raise 'No request id is set'
+        Thread.current[:vcap_request_id]
       end
     end
   end
diff --git a/spec/unit/request_spec.rb b/spec/unit/request_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/request_spec.rb
+++ b/spec/unit/request_spec.rb
@@ -22,10 +22,8 @@ module VCAP
       end
 
       context "when it hasn't been set" do
-        it 'raises an exception' do
-          expect {
-            described_class.current_id
-          }.to raise_error('No request id is set')
+        it 'returns nil' do
+          described_class.current_id.should be_nil
         end
       end
     end
Don't raise exception when request id is unset

[#<I>]