Stop NullPointerExceptions in consumers