Different messages for with/without entitlements. closes #507