Add nil check
Add hack to switch to IsLatest

This should probably be fixed up at some point