diff --git a/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/exception/LyoModelException.java b/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/exception/LyoModelException.java
index 905767d..b63bcc4 100644
--- a/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/exception/LyoModelException.java
+++ b/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/exception/LyoModelException.java
@@ -12,7 +12,10 @@
 
 package org.eclipse.lyo.oslc4j.core.exception;
 
-public class LyoModelException extends Exception {
+/**
+ * An unchecked exception to indicate a problem with (un)marshalling an RDF graph model.
+ */
+public class LyoModelException extends RuntimeException {
 
     public LyoModelException() {
     }
diff --git a/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/JsonOslcNameTest.java b/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/JsonOslcNameTest.java
index 0462abc..3d01def 100644
--- a/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/JsonOslcNameTest.java
+++ b/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/JsonOslcNameTest.java
@@ -41,10 +41,11 @@
 
 /**
  * Tests Json working with different combinations of OslcName annotation.
- * 
+ *
  * @author Fabio Negrello
- * 
+ *
  */
+@SuppressWarnings("deprecation")
 public class JsonOslcNameTest {
 
 	private final String NAME_LOCAL_PART = "name";
@@ -55,7 +56,7 @@ public class JsonOslcNameTest {
 	/**
 	 * Checks that OslcName annotation with empty string does not add RDF type
 	 * to the resource.
-	 * 
+	 *
 	 * @throws Exception
 	 */
 	@Test
@@ -80,7 +81,7 @@ private JSONObject getJSONObject(Object resource, final OslcRdfJsonProvider oslc
 	/**
 	 * Checks that OslcName annotation with empty string does not add default
 	 * RDF type to the resource but adds the ones specified by addTypes method.
-	 * 
+	 *
 	 * @throws Exception
 	 */
 	@Test
@@ -97,7 +98,7 @@ public void testJenaOslcNameEmptyStringAndOtherTypes() throws Exception {
 
 	/**
 	 * Checks that OslcName annotation adds RDF type to the resource.
-	 * 
+	 *
 	 * @throws Exception
 	 */
 	@Test
@@ -113,7 +114,7 @@ public void testJenaRegularOslcName() throws Exception {
 	/**
 	 * Checks that the absence of OslcName annotation adds default RDF type to
 	 * the resource.
-	 * 
+	 *
 	 * @throws Exception
 	 */
 	@Test
@@ -143,7 +144,7 @@ private void verifyRDFTypes(String[] expectedRDFTypes, JSONArray rdfTypes) throw
 
 	/**
 	 * Creates a new instance adding some test values.
-	 * 
+	 *
 	 * @param resource
 	 *			  class.
 	 * @return new instance
diff --git a/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/TestInvalidTypesJson.java b/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/TestInvalidTypesJson.java
index fdb6e14..2520d17 100644
--- a/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/TestInvalidTypesJson.java
+++ b/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/TestInvalidTypesJson.java
@@ -25,6 +25,7 @@
 import org.eclipse.lyo.oslc4j.provider.json4j.test.resources.TestResource;
 import org.junit.Test;
 
+@SuppressWarnings("deprecation")
 public class TestInvalidTypesJson
 {
 	@Test(expected = WebApplicationException.class)