Add workaround for lava NPE