Fixed error trapping again..