Merge branch 'stable-2.13'

* stable-2.13:
  Fix yet another null pointer exception

Change-Id: Id2b163aee90705c9359e6e5e5d2469e9224f9989

src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java b/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java
index 056a1f2..bf7143c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java
@@ -114,7 +114,8 @@
    */
   private String replaceInUrl(String placeholder, String url,
       String replacement) {
-    if (url == null || !url.contains(placeholder)) {
+    if (url == null || replacement == null
+        || !url.contains(placeholder)) {
       return url;
     }