Fixed fatal error with exceptions and fixed updating option