Re-factored neo4j, dbpedia integration and exception handling