Massive rework towards improving error handling and processing