Fix sound path
Add a bit more catch-type stuff