Tweaked install order, fixed error handler