Changes concerning error handlin