small crash bug with exceptions
tweaks