Changes for better error reporting. Attention: Tests don't work => broken build!!!