removed new Error(..) and such