diff --git a/src/main/java/edu/isi/oba/ObaUtils.java b/src/main/java/edu/isi/oba/ObaUtils.java
index fc83123..b106264 100644
--- a/src/main/java/edu/isi/oba/ObaUtils.java
+++ b/src/main/java/edu/isi/oba/ObaUtils.java
@@ -234,6 +234,15 @@ private static JSONObject run_owl_jsonld(String ontology_url) throws Exception {
         }
         if (result != null){
             JSONObject json = new JSONObject(result.toString());
+            //TODO: This is a hack to remove
+            //     "": {"@id": "http://dbpedia.org/ontology/"}
+            //temp_json is a reference to json
+            JSONObject temp_json = (JSONObject) json.get("@context");
+
+            if (!temp_json.isNull("")) {
+                logger.warning("Generating of context.json - Ignoring the class " + temp_json.get("") + ": Name is empty.");
+                temp_json.remove("");
+            }
             return json;
         }
         while ((s = stdError.readLine()) != null) {
diff --git a/src/main/java/edu/isi/oba/SerializerPython.java b/src/main/java/edu/isi/oba/SerializerPython.java
index 05fcf8a..ee51a80 100644
--- a/src/main/java/edu/isi/oba/SerializerPython.java
+++ b/src/main/java/edu/isi/oba/SerializerPython.java
@@ -11,6 +11,7 @@
 import java.util.*;
 
 import static edu.isi.oba.Oba.SERVERS_DIRECTORY;
+import static edu.isi.oba.Oba.logger;
 
 class SerializerPython {
   static final String name = "python";
@@ -71,8 +72,15 @@ private void add_variable_python(FileWriter myWriter, Iterator it) {
       name = (String) pair.getValue();
       try {
         String variable_name = name.toUpperCase().replace("-", "");
-        myWriter.write(variable_name + "_TYPE_URI = \"" + clsIRI + "\"\n");
-        myWriter.write(variable_name + "_TYPE_NAME = \"" + name + "\"\n");
+        //TODO: Catch class name empty
+        String catch_temp = name.replace("<", "").replace(">", "");
+        if (!catch_temp.equals(clsIRI.toString())) {
+          myWriter.write(variable_name + "_TYPE_URI = \"" + clsIRI + "\"\n");
+          myWriter.write(variable_name + "_TYPE_NAME = \"" + name + "\"\n");
+        }
+        else {
+          logger.warning("Ignoring class " + clsIRI);
+        }
       } catch (IOException e) {
         System.out.println("An error occurred.");
         e.printStackTrace();