Fixes null exception matching theme names