EG: fixed potential bug with DUSK/DAWN; put try right