fixed uncatched null