Quickfix

Updatet some little misstakes / Catched some exceptions