CID-1191682 Fix missing break statement
Merge branch 'bugfix/CID-1191682'
Frank forgot the license header
CID-1116298 path can be null, make sure that is properly handled
CID-1116300 Prevent potential NPE