Fix for null-case demo's host