Prevent exception with VIP deletion

Fixes bug 1137697

Change-Id: I6de55c674da1202eb9c1e2e11eda2e6de554750c
Merge "Prevent exception with VIP deletion"