catch more corrupted data
Merge branch 'master' into 'master'

Master

found some more possible errors in the input data to catch
Merge branch 'master-gitlab'