Corrections and small adaptions.
Merge remote-tracking branch 'origin/master' into last_performance_tests
added error handling
Merge branch 'last_performance_tests' of github.com:osiam/osiam into last_performance_tests