Updated check/fix to work off exceptions