(hot fix) follow-up to l4afd88c8 which broke some selenium tests

In case of adding a new claim, an error was thrown. This solves the issue.

Change-Id: I32b17ece8f6fc8013dcda01f46d1f616e72153d3
Merge "(hot fix) follow-up to l4afd88c8 which broke some selenium tests"