Prevent a crash if bundle is null. Related to GH-162
Still honor roaming even if always was selected. Fixes GH-127
Bump version.