Fix NPE that was overlooked in comit 2fa19c55aa2b6d166d51fbf2a83f000bea6db357. Ray- Take a look at this and make sure I'm not missing something.