Merge "Remove error message if instance is not found"