Handled more exceptions