bug 1161: Added errorhandling
bug-1161: bugfix
bug-1161: Replaced tabs with double spaces
Merge branch 'bug-1161' into testserver