Removed useless, broken error management code