Fixed uncatched exception