adding more error logging
Merge branch 'master' into public-profiles

* master:
  adding more error logging