Fix theme null pointer regression