Issue #3354133 by codebymikey, w.drupal: Improve error handling otherwise lots of empty client entries
Closes #3354133