removed unused member variables
added error handling
added string resources for error alert dialog
Merge branch 'error-handling' into develop