Removing Core NPE bug

Signed-off-by: Peter Wilmot <pwilmot@turn.com>