Fixed Exception errors