Fix error string parsing
Initial schema support
Merge branch 'fix-error-parsing'