Improve exceptions cacthing for better user display