Handle undefined theme the right way
Merge pull request #10243 from MarcelGerber/theme-undefined

Handle undefined theme the right way