New error handling
merge
Remove caca, aka (ewgweh2)