some better fault tolerance for DS + WS wrt astrolabe