Use the proper URL for the google repository.

Also fix an NPE.
2 files changed