Fix for Ocelot (and probably Wolf) spawn NPE. Fix VANILLA-300

Signed-off-by: William Lebel <lebelwilliam@gmail.com>