- work on error handling
- added some functions for rollback (fate #317062)