[DO_NOT_MERGE] [origin-ui-180] rhc support for multiple servers

I'm changing to rescue nil in add_or_update though. It does make sense to throw the error on update.