Fix #2438451 (NPE's in Exchange tests)

Bug: 2438451
Change-Id: I8b861a859ae827fdfd3a0a13becfc1a3737cea4c
1 file changed