Merge "Fixing an exception thrown when contact is not found"