fixed exception problems