Fixed RuntimeException observed in the field