Soft scenario removal + improving logging and error reporting.