Fix NPE in enchangint books.
Merge remote-tracking branch 'upstream/master'