added Error to Exception/Warning, parser error handling, fixed gv testfile
fixed merge error
merge fixed
fixed merge conflicts