Fixed NPE when adding new custom Card to an existing set