Add better error handling an pin version of rethinkdbdash