Fix issue in no-cellular environment
Merge branch 'master' of github.com:kazyx/WPPMM
Avoid exceptions.