Adding check to throw exception when Apple fixes the issue