More error handling, refactoring
Merge branch 'master' of https://github.com/sparkica/grefine-rdf-extension