Cleanup + add missing error handler