Fixes NPE on demo app