Fix NPE
Fix NPE. Take two
Fix NPE. Bad compile fix
Fixing desync. take two