Fixed more exceptions