Fail gracefully when theme does not exist
Merge remote-tracking branch 'origin/develop' into develop