Better error reporting & updated dependencies