diff --git a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartReader.java b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartReader.java
index 5480f1d8839..d4c0850b288 100644
--- a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartReader.java
+++ b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartReader.java
@@ -15,7 +15,6 @@
 import java.io.InputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
-import javax.ws.rs.BadRequestException;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@@ -36,7 +35,7 @@ public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotati
    public MultipartInput readFrom(Class<MultipartInput> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException
    {
       String boundary = mediaType.getParameters().get("boundary");
-      if (boundary == null) throw new BadRequestException(Messages.MESSAGES.unableToGetBoundary());
+      if (boundary == null) throw new IOException(Messages.MESSAGES.unableToGetBoundary());
       MultipartInputImpl input = new MultipartInputImpl(mediaType, workers);
       /*
       StringWriter writer = new StringWriter();
diff --git a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/delegates/MediaTypeHeaderDelegate.java b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/delegates/MediaTypeHeaderDelegate.java
index 2a89d8746fd..7dca456235f 100644
--- a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/delegates/MediaTypeHeaderDelegate.java
+++ b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/delegates/MediaTypeHeaderDelegate.java
@@ -11,7 +11,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.ws.rs.BadRequestException;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@@ -94,7 +93,7 @@ private static MediaType internalParse(String type)
          }
          if (!MediaType.MEDIA_TYPE_WILDCARD.equals(major))
          {
-            throw new BadRequestException(Messages.MESSAGES.failureParsingMediaType(type));
+            throw new IllegalArgumentException(Messages.MESSAGES.failureParsingMediaType(type));
          }
          subtype = MediaType.MEDIA_TYPE_WILDCARD;
       }
@@ -112,11 +111,11 @@ private static MediaType internalParse(String type)
       }
       if (major.length() < 1 || subtype.length() < 1)
       {
-         throw new BadRequestException(Messages.MESSAGES.failureParsingMediaType(type));
+         throw new IllegalArgumentException(Messages.MESSAGES.failureParsingMediaType(type));
       }
       if (!isValid(major) || !isValid(subtype))
       {
-         throw new BadRequestException(Messages.MESSAGES.failureParsingMediaType(type));
+         throw new IllegalArgumentException(Messages.MESSAGES.failureParsingMediaType(type));
       }
       String params = null;
       if (paramIndex > -1) params = type.substring(paramIndex + 1);
diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/ClientBuilderTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/ClientBuilderTest.java
index 1301aa9599b..11dfb94d570 100644
--- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/ClientBuilderTest.java
+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/ClientBuilderTest.java
@@ -16,7 +16,6 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.RuntimeDelegate;
-import javax.ws.rs.BadRequestException;
 
 import static org.jboss.resteasy.test.TestPortProvider.generateURL;
 
@@ -33,7 +32,7 @@ public class ClientBuilderTest {
     * @tpPassCrit IllegalArgumentException is raised
     * @tpSince RESTEasy 3.0.16
     */
-   @Test(expected = BadRequestException.class)
+   @Test(expected = IllegalArgumentException.class)
    public void entityStringThrowsExceptionWhenUnparsableTest() throws Exception {
       Entity.entity("entity", "\\//\\");
       Assert.fail();
diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/mediatype/MediaTypeHeaderTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/mediatype/MediaTypeHeaderTest.java
index 21fd3a068e3..e46f018f7fc 100644
--- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/mediatype/MediaTypeHeaderTest.java
+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/mediatype/MediaTypeHeaderTest.java
@@ -2,11 +2,10 @@
 
 import org.jboss.resteasy.plugins.delegates.MediaTypeHeaderDelegate;
 import org.junit.Test;
-import javax.ws.rs.BadRequestException;
 
 public class MediaTypeHeaderTest {
 
-   @Test(expected = BadRequestException.class)
+   @Test(expected = IllegalArgumentException.class)
    public void testNewLineInHeaderValueIsRejected() {
       MediaTypeHeaderDelegate delegate = new MediaTypeHeaderDelegate();