Changed exception handlings