DO NOT MERGE - Fix CNAP-related NullPointerException

This will fix a CNAP-related bug where missing a call from a party with an
"Unknown" number presentation and then trying to log that call will cause
a NullPointerException to be thrown.

This was already merged into master so marked will not be merged.