Feature/zen 13132

I don't think this try/raise is really doing anything useful, is it?