Avoid a NPE; Varies fixes according to warning messages.
Avoid another race condition for presentation compiler.