Fix for some rare exceptions