Merge commit '1e563f91183d95f5ad2461b7bca864e8f223ef71' * commit '1e563f91183d95f5ad2461b7bca864e8f223ef71': Fixing the NPE in SipPhone
Merge commit '1e563f91183d95f5ad2461b7bca864e8f223ef71' * commit '1e563f91183d95f5ad2461b7bca864e8f223ef71': Fixing the NPE in SipPhone