Fix rstag failure handling