Updated logic to handle new fog exception handling