some code to fail more gracefully on 3.4 system and with non-admin login
merged remote changes