Hot-fix (exceptions handling bug)