diff --git a/doc/JSON.Decoder.UnexpectedTokenError.html b/doc/JSON.Decoder.UnexpectedTokenError.html
index 645c15e..b4895f5 100644
--- a/doc/JSON.Decoder.UnexpectedTokenError.html
+++ b/doc/JSON.Decoder.UnexpectedTokenError.html
@@ -118,7 +118,7 @@ <h2>
     <a href="#message/1">message(exception)</a>
   </div>
   
-    <div class="summary-synopsis"><p>Callback implementation for <a href="https://hexdocs.pm/elixir/Exception.html#c:message/1"><code class="inline">Exception.message/1</code></a></p>
+    <div class="summary-synopsis"><p>Invalid JSON - Unexpected token</p>
 </div>
   
 </div>
@@ -175,7 +175,7 @@ <h1 class="section-heading">
     </a>
     <span class="signature">message(exception)</span>
     
-      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/decoder.ex#L20" class="view-source" rel="help" title="View Source">
+      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/decoder.ex#L24" class="view-source" rel="help" title="View Source">
        <span class="icon-code" aria-hidden="true"></span>
        <span class="sr-only">View Source</span>
      </a>
@@ -184,7 +184,7 @@ <h1 class="section-heading">
     
   </div>
   <section class="docstring">
-    <p>Callback implementation for <a href="https://hexdocs.pm/elixir/Exception.html#c:message/1"><code class="inline">Exception.message/1</code></a>.</p>
+    <p>  Invalid JSON - Unexpected token</p>
 
   </section>
 </div>
diff --git a/doc/JSON.Decoder.html b/doc/JSON.Decoder.html
index e4470a4..f0f6650 100644
--- a/doc/JSON.Decoder.html
+++ b/doc/JSON.Decoder.html
@@ -74,7 +74,7 @@ <h1>
         <small class="visible-xs">json v1.0.3</small>
         JSON.Decoder <small>protocol</small>
         
-          <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/decoder.ex#L23" title="View Source" class="view-source" rel="help">
+          <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/decoder.ex#L27" title="View Source" class="view-source" rel="help">
             <span class="icon-code" aria-hidden="true"></span>
             <span class="sr-only">View Source</span>
           </a>
@@ -155,7 +155,7 @@ <h1 class="section-heading">
     </a>
     <span class="signature">t()</span>
     
-      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/decoder.ex#L23" class="view-source" rel="help" title="View Source">
+      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/decoder.ex#L27" class="view-source" rel="help" title="View Source">
        <span class="icon-code" aria-hidden="true"></span>
        <span class="sr-only">View Source</span>
      </a>
@@ -197,7 +197,7 @@ <h1 class="section-heading">
     </a>
     <span class="signature">decode(bitstring_or_char_list)</span>
     
-      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/decoder.ex#L32" class="view-source" rel="help" title="View Source">
+      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/decoder.ex#L36" class="view-source" rel="help" title="View Source">
        <span class="icon-code" aria-hidden="true"></span>
        <span class="sr-only">View Source</span>
      </a>
diff --git a/doc/JSON.Encoder.Error.html b/doc/JSON.Encoder.Error.html
index ff9a69c..025a339 100644
--- a/doc/JSON.Encoder.Error.html
+++ b/doc/JSON.Encoder.Error.html
@@ -82,6 +82,11 @@ <h1>
       </h1>
 
       
+        <section id="moduledoc">
+          <p>Thrown when an encoder error happens</p>
+
+        </section>
+      
 
       
         <section id="summary" class="details-list">
@@ -113,7 +118,7 @@ <h2>
     <a href="#message/1">message(exception)</a>
   </div>
   
-    <div class="summary-synopsis"><p>Callback implementation for <a href="https://hexdocs.pm/elixir/Exception.html#c:message/1"><code class="inline">Exception.message/1</code></a></p>
+    <div class="summary-synopsis"><p>Invalid Term</p>
 </div>
   
 </div>
@@ -147,7 +152,7 @@ <h1 class="section-heading">
     </a>
     <span class="signature">exception(args)</span>
     
-      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L2" class="view-source" rel="help" title="View Source">
+      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L5" class="view-source" rel="help" title="View Source">
        <span class="icon-code" aria-hidden="true"></span>
        <span class="sr-only">View Source</span>
      </a>
@@ -170,7 +175,7 @@ <h1 class="section-heading">
     </a>
     <span class="signature">message(exception)</span>
     
-      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L4" class="view-source" rel="help" title="View Source">
+      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L10" class="view-source" rel="help" title="View Source">
        <span class="icon-code" aria-hidden="true"></span>
        <span class="sr-only">View Source</span>
      </a>
@@ -179,7 +184,7 @@ <h1 class="section-heading">
     
   </div>
   <section class="docstring">
-    <p>Callback implementation for <a href="https://hexdocs.pm/elixir/Exception.html#c:message/1"><code class="inline">Exception.message/1</code></a>.</p>
+    <p>  Invalid Term</p>
 
   </section>
 </div>
diff --git a/doc/JSON.Encoder.Helpers.html b/doc/JSON.Encoder.Helpers.html
index fcba35c..8d1a9cc 100644
--- a/doc/JSON.Encoder.Helpers.html
+++ b/doc/JSON.Encoder.Helpers.html
@@ -74,7 +74,7 @@ <h1>
         <small class="visible-xs">json v1.0.3</small>
         JSON.Encoder.Helpers
         
-          <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L264" title="View Source" class="view-source" rel="help">
+          <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L270" title="View Source" class="view-source" rel="help">
             <span class="icon-code" aria-hidden="true"></span>
             <span class="sr-only">View Source</span>
           </a>
@@ -153,7 +153,7 @@ <h1 class="section-heading">
     </a>
     <span class="signature">dict_encode(coll)</span>
     
-      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L281" class="view-source" rel="help" title="View Source">
+      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L287" class="view-source" rel="help" title="View Source">
        <span class="icon-code" aria-hidden="true"></span>
        <span class="sr-only">View Source</span>
      </a>
@@ -177,7 +177,7 @@ <h1 class="section-heading">
     </a>
     <span class="signature">enum_encode(coll)</span>
     
-      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L273" class="view-source" rel="help" title="View Source">
+      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L279" class="view-source" rel="help" title="View Source">
        <span class="icon-code" aria-hidden="true"></span>
        <span class="sr-only">View Source</span>
      </a>
diff --git a/doc/JSON.Encoder.html b/doc/JSON.Encoder.html
index 6382b78..c457a28 100644
--- a/doc/JSON.Encoder.html
+++ b/doc/JSON.Encoder.html
@@ -74,7 +74,7 @@ <h1>
         <small class="visible-xs">json v1.0.3</small>
         JSON.Encoder <small>protocol</small>
         
-          <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L14" title="View Source" class="view-source" rel="help">
+          <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L20" title="View Source" class="view-source" rel="help">
             <span class="icon-code" aria-hidden="true"></span>
             <span class="sr-only">View Source</span>
           </a>
@@ -164,7 +164,7 @@ <h1 class="section-heading">
     </a>
     <span class="signature">t()</span>
     
-      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L14" class="view-source" rel="help" title="View Source">
+      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L20" class="view-source" rel="help" title="View Source">
        <span class="icon-code" aria-hidden="true"></span>
        <span class="sr-only">View Source</span>
      </a>
@@ -206,7 +206,7 @@ <h1 class="section-heading">
     </a>
     <span class="signature">encode(term)</span>
     
-      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L35" class="view-source" rel="help" title="View Source">
+      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L41" class="view-source" rel="help" title="View Source">
        <span class="icon-code" aria-hidden="true"></span>
        <span class="sr-only">View Source</span>
      </a>
@@ -248,7 +248,7 @@ <h2 id="encode/1-examples" class="section-heading">
     </a>
     <span class="signature">typeof(term)</span>
     
-      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L60" class="view-source" rel="help" title="View Source">
+      <a href="https://github.com/cblage/elixir-json/blob/master/lib/json/encoder.ex#L66" class="view-source" rel="help" title="View Source">
        <span class="icon-code" aria-hidden="true"></span>
        <span class="sr-only">View Source</span>
      </a>
diff --git a/doc/api-reference.html b/doc/api-reference.html
index b8015d0..e2895f4 100644
--- a/doc/api-reference.html
+++ b/doc/api-reference.html
@@ -232,6 +232,9 @@ <h2 id="exceptions" class="section-heading">
 <div class="summary-row">
   <div class="summary-signature"><a href="JSON.Encoder.Error.html">JSON.Encoder.Error</a></div>
   
+    <div class="summary-synopsis"><p>Thrown when an encoder error happens</p>
+</div>
+  
 </div>
 
     </div>
diff --git a/lib/json/decoder.ex b/lib/json/decoder.ex
index c24c4ef..7b9bd69 100644
--- a/lib/json/decoder.ex
+++ b/lib/json/decoder.ex
@@ -3,18 +3,6 @@ defmodule JSON.Decoder.Error do
   Thrown when an unknown decoder error happens
   """
   defexception [message: "Invalid JSON - unknown error"]
-
-  @doc """
-    Invalid JSON
-  """
-  @spec message(__MODULE__.t) :: String.t
-  def message(exception)
-
-  @doc """
-    Invalid JSON
-  """
-  @spec exception(term) :: __MODULE__.t
-  def exception(term)
 end
 
 defmodule JSON.Decoder.UnexpectedEndOfBufferError do
@@ -22,18 +10,6 @@ defmodule JSON.Decoder.UnexpectedEndOfBufferError do
   Thrown when the json payload is incomplete
   """
   defexception [message: "Invalid JSON - unexpected end of buffer"]
-
-  @doc """
-    Invalid JSON - unexpected end of buffer
-  """
-  @spec message(__MODULE__.t) :: String.t
-  def message(exception)
-
-  @doc """
-    Invalid JSON - unexpected end of buffer
-  """
-  @spec exception(term) :: __MODULE__.t
-  def exception(term)
 end
 
 defmodule JSON.Decoder.UnexpectedTokenError do
@@ -45,14 +21,7 @@ defmodule JSON.Decoder.UnexpectedTokenError do
   @doc """
     Invalid JSON - Unexpected token
   """
-  @spec message(__MODULE__.t) :: String.t
   def message(exception), do: "Invalid JSON - unexpected token >>#{exception.token}<<"
-
-  @doc """
-    Invalid JSON - unexpected token
-  """
-  @spec exception(term) :: __MODULE__.t
-  def exception(term)
 end
 
 defprotocol JSON.Decoder do
diff --git a/lib/json/encoder.ex b/lib/json/encoder.ex
index 36516b8..6334960 100644
--- a/lib/json/encoder.ex
+++ b/lib/json/encoder.ex
@@ -4,16 +4,9 @@ defmodule JSON.Encoder.Error do
   """
   defexception [error_info: nil]
 
-  @doc """
-    Invalid term to Encode
-  """
-  @spec exception(term) :: __MODULE__.t
-  def exception(term)
-
   @doc """
     Invalid Term
   """
-  @spec message(__MODULE__.t) :: String.t
   def message(exception) do
     error_message = "An error occurred while encoding the JSON object"
     if nil != exception.error_info  do