fixed a few exception