Fixed test, rethrowing any dao exception that isn't about nonexistant
zone
[#82411992] [https://www.pivotaltracker.com/story/show/82588908]