Release day bugfixes 3

Fix an obscure NPE that occurs during creative mode.