It looks like this is now much more robust. However, the warning message is not appearing (I noticed it in the code when I pulled).