add try/catch block to try to diagnose NullPointerException.
Merge commit 'f64fb987de5c09272f976c9656a3ea5314274544'

add try/catch block to try to diagnose NullPointerException.