diff --git a/spec/contracts_spec.rb b/spec/contracts_spec.rb
index 525588f..1fc7647 100644
--- a/spec/contracts_spec.rb
+++ b/spec/contracts_spec.rb
@@ -383,9 +383,62 @@ def self.greeting(name)
     it "should handle properly lack of block when there are other arguments" do
       expect do
         @o.double_with_proc(4)
-      end.to raise_error(ContractError, /Actual: nil/)
+      end.to raise_error(ContractError, /Expected: Proc/)
     end
 
+    describe "and nil default values" do
+      it "should fail for lack of block when default used" do
+        expect do
+          @o.default_nil_with_block
+        end.to raise_error(ContractError, /Expected: Proc/)
+      end
+
+      it "should fail for lack of block when default overidden" do
+        expect do
+          @o.default_nil_with_block(:arg)
+        end.to raise_error(ContractError, /Expected: Proc/)
+      end
+
+      it "should succeed when default used and block given" do
+        expect do
+          @o.default_nil_with_block() {}
+        end.to_not raise_error
+      end
+
+      it "should succeed when default overidden and block given" do
+        expect do
+          @o.default_nil_with_block(:arg) {}
+        end.to_not raise_error
+      end
+    end
+
+    describe "and non-nil default values" do
+      it "should fail for lack of block when default used" do
+        expect do
+          @o.default_with_block
+        end.to raise_error(ContractError, /Expected: Proc/)
+      end
+
+      it "should fail for lack of block when default overidden" do
+        expect do
+          @o.default_with_block(:arg)
+        end.to raise_error(ContractError, /Actual: nil/)
+      end
+
+      it "should succeed when default used and block given" do
+        expect do
+          @o.default_with_block() {}
+        end.to_not raise_error
+      end
+
+      it "should succeed when default overidden and block given" do
+        expect do
+          @o.default_with_block(:arg) {}
+        end.to_not raise_error
+      end
+    end
+
+
     it "should succeed for maybe proc with no proc" do
       expect do
         @o.maybe_call(5)
diff --git a/spec/fixtures/fixtures.rb b/spec/fixtures/fixtures.rb
index 063c3ed..1036dae 100644
--- a/spec/fixtures/fixtures.rb
+++ b/spec/fixtures/fixtures.rb
@@ -191,6 +191,14 @@ def double_with_proc(x, &blk)
     nil
   end
 
+  Contract C::Maybe[Symbol], Proc => nil
+  def default_nil_with_block(param = nil, &block)
+  end
+
+  Contract Symbol, Proc => nil
+  def default_with_block(param = :default, &block)
+  end
+
   Contract C::Pos => nil
   def pos_test(x)
   end