Updates #12 + error handler