Resolve #3361504 "Throws error if"

sleitnerrequested to merge
issue/date_pager-3361504:3361504-throws-error-if into 8.x-1.x

Closes #3361504

Merge request reports