error handling
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.3