Avoid NPE
Improve demo for mobile