ErrorHandler and other changes which did not commit last time :/