r9090: properly check for errors