Merge commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7' * commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7': Fix a null pointer exception caught by the monkey.