rare nullpointer fix
Merge branch 'master' of github.com:Q42/WigglePhone