Merge commit 'ab3803bd8db8c4d73ae2566764408f9c4a0d24ab' * commit 'ab3803bd8db8c4d73ae2566764408f9c4a0d24ab': Check for a null history item to avoid crashing.