fixed error message handling, changed application names