Remove confusing conditional localize, handle error case in test
Remove confusing conditional localize, handle error case in test

- Workaround added to model rather than fixed in caller, like from test

unlimitedbacon/MatterControl,unlimitedbacon/MatterControl,jlewin/MatterControl,larsbrubaker/MatterControl,larsbrubaker/MatterControl,larsbrubaker/MatterControl,larsbrubaker/MatterControl,unlimitedbacon/MatterControl,unlimitedbacon/MatterControl,mmoening/MatterControl,jlewin/MatterControl,jlewin/MatterControl,jlewin/MatterControl,mmoening/MatterControl,mmoening/MatterControl