diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index d6eac232e..771e113d3 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.eclipse.jgit.api;version="[0.9.0,0.10.0)",
+ org.eclipse.jgit.api.errors;version="[0.9.0,0.10.0)",
  org.eclipse.jgit.awtui;version="[0.9.0,0.10.0)",
  org.eclipse.jgit.diff;version="[0.9.0,0.10.0)",
  org.eclipse.jgit.dircache;version="[0.9.0,0.10.0)",
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java
index 5cf598917..2737422dc 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java
@@ -38,11 +38,11 @@
 package org.eclipse.jgit.pgm;
 
 import org.eclipse.jgit.api.CommitCommand;
-import org.eclipse.jgit.api.ConcurrentRefUpdateException;
 import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.JGitInternalException;
-import org.eclipse.jgit.api.NoHeadException;
-import org.eclipse.jgit.api.NoMessageException;
+import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
+import org.eclipse.jgit.api.errors.JGitInternalException;
+import org.eclipse.jgit.api.errors.NoHeadException;
+import org.eclipse.jgit.api.errors.NoMessageException;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.revwalk.RevCommit;
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index f25358b42..c1ef787b1 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Import-Package: junit.framework;version="[4.0.0,5.0.0)",
  junit.textui;version="[3.8.2,4.0.0)",
  org.eclipse.jgit;version="[0.9.0,0.10.0)",
  org.eclipse.jgit.api;version="[0.9.0,0.10.0)",
+ org.eclipse.jgit.api.errors;version="[0.9.0,0.10.0)",
  org.eclipse.jgit.awtui;version="[0.9.0,0.10.0)",
  org.eclipse.jgit.console;version="[0.9.0,0.10.0)",
  org.eclipse.jgit.diff;version="[0.9.0,0.10.0)",
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java
index 2dbf92998..68007b6cf 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java
@@ -48,6 +48,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
+import org.eclipse.jgit.api.errors.NoFilepatternException;
 import org.eclipse.jgit.dircache.DirCache;
 import org.eclipse.jgit.dircache.DirCacheBuilder;
 import org.eclipse.jgit.dircache.DirCacheEntry;
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java
index cf30039ab..9106cc2c0 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java
@@ -47,6 +47,12 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
+import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
+import org.eclipse.jgit.api.errors.JGitInternalException;
+import org.eclipse.jgit.api.errors.NoFilepatternException;
+import org.eclipse.jgit.api.errors.NoHeadException;
+import org.eclipse.jgit.api.errors.NoMessageException;
+import org.eclipse.jgit.api.errors.WrongRepositoryStateException;
 import org.eclipse.jgit.errors.UnmergedPathException;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
index 2def86cf1..02d4b0e15 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
@@ -48,6 +48,7 @@
 import java.util.Iterator;
 
 import org.eclipse.jgit.api.MergeResult.MergeStatus;
+import org.eclipse.jgit.api.errors.InvalidMergeHeadsException;
 import org.eclipse.jgit.dircache.DirCacheCheckout;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/TagCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/TagCommandTest.java
index 79054fba6..47b49af1b 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/TagCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/TagCommandTest.java
@@ -42,6 +42,12 @@
  */
 package org.eclipse.jgit.api;
 
+import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
+import org.eclipse.jgit.api.errors.InvalidTagNameException;
+import org.eclipse.jgit.api.errors.JGitInternalException;
+import org.eclipse.jgit.api.errors.NoHeadException;
+import org.eclipse.jgit.api.errors.NoMessageException;
+import org.eclipse.jgit.api.errors.WrongRepositoryStateException;
 import org.eclipse.jgit.errors.UnmergedPathException;
 import org.eclipse.jgit.lib.RepositoryTestCase;
 import org.eclipse.jgit.revwalk.RevCommit;
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index a8f39d93b..0c4d102e7 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -7,10 +7,11 @@ Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
 Export-Package: org.eclipse.jgit;version="0.9.0",
  org.eclipse.jgit.api;version="0.9.0",
+ org.eclipse.jgit.api.errors;version="0.9.0",
  org.eclipse.jgit.diff;version="0.9.0",
  org.eclipse.jgit.dircache;version="0.9.0",
- org.eclipse.jgit.events;version="0.9.0",
  org.eclipse.jgit.errors;version="0.9.0",
+ org.eclipse.jgit.events;version="0.9.0",
  org.eclipse.jgit.fnmatch;version="0.9.0",
  org.eclipse.jgit.ignore;version="0.9.0",
  org.eclipse.jgit.lib;version="0.9.0",
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java
index 29c520c17..7a01e74b0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java
@@ -49,6 +49,8 @@
 import java.util.LinkedList;
 
 import org.eclipse.jgit.JGitText;
+import org.eclipse.jgit.api.errors.JGitInternalException;
+import org.eclipse.jgit.api.errors.NoFilepatternException;
 import org.eclipse.jgit.dircache.DirCache;
 import org.eclipse.jgit.dircache.DirCacheBuildIterator;
 import org.eclipse.jgit.dircache.DirCacheBuilder;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
index e385e7cb8..1f59dfdbd 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
@@ -48,6 +48,12 @@
 import java.util.List;
 
 import org.eclipse.jgit.JGitText;
+import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
+import org.eclipse.jgit.api.errors.JGitInternalException;
+import org.eclipse.jgit.api.errors.NoFilepatternException;
+import org.eclipse.jgit.api.errors.NoHeadException;
+import org.eclipse.jgit.api.errors.NoMessageException;
+import org.eclipse.jgit.api.errors.WrongRepositoryStateException;
 import org.eclipse.jgit.dircache.DirCache;
 import org.eclipse.jgit.errors.UnmergedPathException;
 import org.eclipse.jgit.lib.CommitBuilder;
@@ -57,9 +63,9 @@
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.RefUpdate;
+import org.eclipse.jgit.lib.RefUpdate.Result;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.RepositoryState;
-import org.eclipse.jgit.lib.RefUpdate.Result;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
 
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java
index 61a87b416..aa1cdea7d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java
@@ -46,6 +46,8 @@
 import java.text.MessageFormat;
 
 import org.eclipse.jgit.JGitText;
+import org.eclipse.jgit.api.errors.JGitInternalException;
+import org.eclipse.jgit.api.errors.NoHeadException;
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.errors.MissingObjectException;
 import org.eclipse.jgit.lib.AnyObjectId;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
index 48920fe42..b2e0175e3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
@@ -52,16 +52,23 @@
 
 import org.eclipse.jgit.JGitText;
 import org.eclipse.jgit.api.MergeResult.MergeStatus;
+import org.eclipse.jgit.api.errors.CheckoutConflictException;
+import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
+import org.eclipse.jgit.api.errors.InvalidMergeHeadsException;
+import org.eclipse.jgit.api.errors.JGitInternalException;
+import org.eclipse.jgit.api.errors.NoHeadException;
+import org.eclipse.jgit.api.errors.NoMessageException;
+import org.eclipse.jgit.api.errors.WrongRepositoryStateException;
 import org.eclipse.jgit.dircache.DirCacheCheckout;
 import org.eclipse.jgit.lib.AnyObjectId;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectIdRef;
 import org.eclipse.jgit.lib.Ref;
-import org.eclipse.jgit.lib.RefUpdate;
-import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.Ref.Storage;
+import org.eclipse.jgit.lib.RefUpdate;
 import org.eclipse.jgit.lib.RefUpdate.Result;
+import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.merge.MergeStrategy;
 import org.eclipse.jgit.merge.ResolveMerger;
 import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java
index 77a8825d0..27248529f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java
@@ -46,6 +46,10 @@
 import java.text.MessageFormat;
 
 import org.eclipse.jgit.JGitText;
+import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
+import org.eclipse.jgit.api.errors.InvalidTagNameException;
+import org.eclipse.jgit.api.errors.JGitInternalException;
+import org.eclipse.jgit.api.errors.NoHeadException;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectInserter;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutConflictException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/CheckoutConflictException.java
similarity index 98%
rename from org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutConflictException.java
rename to org.eclipse.jgit/src/org/eclipse/jgit/api/errors/CheckoutConflictException.java
index 09dda6f61..de45c1d8e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutConflictException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/CheckoutConflictException.java
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.eclipse.jgit.api;
+package org.eclipse.jgit.api.errors;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ConcurrentRefUpdateException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/ConcurrentRefUpdateException.java
similarity index 91%
rename from org.eclipse.jgit/src/org/eclipse/jgit/api/ConcurrentRefUpdateException.java
rename to org.eclipse.jgit/src/org/eclipse/jgit/api/errors/ConcurrentRefUpdateException.java
index 2a5f7f922..0321ae422 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ConcurrentRefUpdateException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/ConcurrentRefUpdateException.java
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.eclipse.jgit.api;
+package org.eclipse.jgit.api.errors;
 
 import java.text.MessageFormat;
 
@@ -54,7 +54,13 @@ public class ConcurrentRefUpdateException extends GitAPIException {
 	private RefUpdate.Result rc;
 	private Ref ref;
 
-	ConcurrentRefUpdateException(String message, Ref ref,
+	/**
+	 * @param message
+	 * @param ref
+	 * @param rc
+	 * @param cause
+	 */
+	public ConcurrentRefUpdateException(String message, Ref ref,
 			RefUpdate.Result rc, Throwable cause) {
 		super((rc == null) ? message : message + ". "
 				+ MessageFormat.format(JGitText.get().refUpdateReturnCodeWas, rc), cause);
@@ -62,7 +68,12 @@ public class ConcurrentRefUpdateException extends GitAPIException {
 		this.ref = ref;
 	}
 
-	ConcurrentRefUpdateException(String message, Ref ref,
+	/**
+	 * @param message
+	 * @param ref
+	 * @param rc
+	 */
+	public ConcurrentRefUpdateException(String message, Ref ref,
 			RefUpdate.Result rc) {
 		super((rc == null) ? message : message + ". "
 				+ MessageFormat.format(JGitText.get().refUpdateReturnCodeWas, rc));
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/GitAPIException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/GitAPIException.java
similarity index 98%
rename from org.eclipse.jgit/src/org/eclipse/jgit/api/GitAPIException.java
rename to org.eclipse.jgit/src/org/eclipse/jgit/api/errors/GitAPIException.java
index 9991502aa..ba38529ab 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/GitAPIException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/GitAPIException.java
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.eclipse.jgit.api;
+package org.eclipse.jgit.api.errors;
 
 /**
  * Superclass of all exceptions thrown by the API classes in
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/InvalidMergeHeadsException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidMergeHeadsException.java
similarity index 95%
rename from org.eclipse.jgit/src/org/eclipse/jgit/api/InvalidMergeHeadsException.java
rename to org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidMergeHeadsException.java
index 774885391..e56cbc438 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/InvalidMergeHeadsException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidMergeHeadsException.java
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.eclipse.jgit.api;
+package org.eclipse.jgit.api.errors;
 
 
 /**
@@ -47,7 +47,10 @@
 public class InvalidMergeHeadsException extends GitAPIException {
 	private static final long serialVersionUID = 1L;
 
-	InvalidMergeHeadsException(String msg) {
+	/**
+	 * @param msg
+	 */
+	public InvalidMergeHeadsException(String msg) {
 		super(msg);
 	}
 }
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/InvalidTagNameException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidTagNameException.java
similarity index 95%
rename from org.eclipse.jgit/src/org/eclipse/jgit/api/InvalidTagNameException.java
rename to org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidTagNameException.java
index ceff63784..1779c45e2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/InvalidTagNameException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidTagNameException.java
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.eclipse.jgit.api;
+package org.eclipse.jgit.api.errors;
 
 /**
  * Exception thrown when a tag command was called with an invalid tag name (or
@@ -44,7 +44,10 @@
 public class InvalidTagNameException extends GitAPIException {
 	private static final long serialVersionUID = 1L;
 
-	InvalidTagNameException(String msg) {
+	/**
+	 * @param msg
+	 */
+	public InvalidTagNameException(String msg) {
 		super(msg);
 	}
 }
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/JGitInternalException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/JGitInternalException.java
similarity index 93%
rename from org.eclipse.jgit/src/org/eclipse/jgit/api/JGitInternalException.java
rename to org.eclipse.jgit/src/org/eclipse/jgit/api/errors/JGitInternalException.java
index a0475da13..9042daddc 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/JGitInternalException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/JGitInternalException.java
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.eclipse.jgit.api;
+package org.eclipse.jgit.api.errors;
 
 /**
  * Exception thrown when during command execution a low-level exception from the
@@ -59,11 +59,18 @@
 public class JGitInternalException extends RuntimeException {
 	private static final long serialVersionUID = 1L;
 
-	JGitInternalException(String message, Throwable cause) {
+	/**
+	 * @param message
+	 * @param cause
+	 */
+	public JGitInternalException(String message, Throwable cause) {
 		super(message, cause);
 	}
 
-	JGitInternalException(String message) {
+	/**
+	 * @param message
+	 */
+	public JGitInternalException(String message) {
 		super(message);
 	}
 }
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/NoFilepatternException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/NoFilepatternException.java
similarity index 91%
rename from org.eclipse.jgit/src/org/eclipse/jgit/api/NoFilepatternException.java
rename to org.eclipse.jgit/src/org/eclipse/jgit/api/errors/NoFilepatternException.java
index 8a845d515..1130c256f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/NoFilepatternException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/NoFilepatternException.java
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.eclipse.jgit.api;
+package org.eclipse.jgit.api.errors;
 
 /**
  * Exception thrown when the options given to a command don't include a
@@ -47,11 +47,18 @@ public class NoFilepatternException extends GitAPIException {
 
 	private static final long serialVersionUID = 1L;
 
-	NoFilepatternException(String message, Throwable cause) {
+	/**
+	 * @param message
+	 * @param cause
+	 */
+	public NoFilepatternException(String message, Throwable cause) {
 		super(message, cause);
 	}
 
-	NoFilepatternException(String message) {
+	/**
+	 * @param message
+	 */
+	public NoFilepatternException(String message) {
 		super(message);
 	}
 
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/NoHeadException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/NoHeadException.java
similarity index 91%
rename from org.eclipse.jgit/src/org/eclipse/jgit/api/NoHeadException.java
rename to org.eclipse.jgit/src/org/eclipse/jgit/api/errors/NoHeadException.java
index 5d79233cf..50c4dc96b 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/NoHeadException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/NoHeadException.java
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.eclipse.jgit.api;
+package org.eclipse.jgit.api.errors;
 
 /**
  * Exception thrown when a command expected the {@code HEAD} reference to exist
@@ -44,11 +44,18 @@
 public class NoHeadException extends GitAPIException {
 	private static final long serialVersionUID = 1L;
 
-	NoHeadException(String message, Throwable cause) {
+	/**
+	 * @param message
+	 * @param cause
+	 */
+	public NoHeadException(String message, Throwable cause) {
 		super(message, cause);
 	}
 
-	NoHeadException(String message) {
+	/**
+	 * @param message
+	 */
+	public NoHeadException(String message) {
 		super(message);
 	}
 }
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/NoMessageException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/NoMessageException.java
similarity index 91%
rename from org.eclipse.jgit/src/org/eclipse/jgit/api/NoMessageException.java
rename to org.eclipse.jgit/src/org/eclipse/jgit/api/errors/NoMessageException.java
index ab5652e24..b7d8dc8db 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/NoMessageException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/NoMessageException.java
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.eclipse.jgit.api;
+package org.eclipse.jgit.api.errors;
 
 /**
  * Exception thrown when the options given to a command don't include a
@@ -46,11 +46,18 @@
 public class NoMessageException extends GitAPIException {
 	private static final long serialVersionUID = 1L;
 
-	NoMessageException(String message, Throwable cause) {
+	/**
+	 * @param message
+	 * @param cause
+	 */
+	public NoMessageException(String message, Throwable cause) {
 		super(message, cause);
 	}
 
-	NoMessageException(String message) {
+	/**
+	 * @param message
+	 */
+	public NoMessageException(String message) {
 		super(message);
 	}
 }
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/WrongRepositoryStateException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/WrongRepositoryStateException.java
similarity index 90%
rename from org.eclipse.jgit/src/org/eclipse/jgit/api/WrongRepositoryStateException.java
rename to org.eclipse.jgit/src/org/eclipse/jgit/api/errors/WrongRepositoryStateException.java
index 833cf8d6e..dd2b3998e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/WrongRepositoryStateException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/WrongRepositoryStateException.java
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.eclipse.jgit.api;
+package org.eclipse.jgit.api.errors;
 
 /**
  * Exception thrown when the state of the repository doesn't allow the execution
@@ -45,11 +45,18 @@
 public class WrongRepositoryStateException extends GitAPIException {
 	private static final long serialVersionUID = 1L;
 
-	WrongRepositoryStateException(String message, Throwable cause) {
+	/**
+	 * @param message
+	 * @param cause
+	 */
+	public WrongRepositoryStateException(String message, Throwable cause) {
 		super(message, cause);
 	}
 
-	WrongRepositoryStateException(String message) {
+	/**
+	 * @param message
+	 */
+	public WrongRepositoryStateException(String message) {
 		super(message);
 	}
 }