catch by mark in https://www.drupal.org/node/2337947#comment-9187217