Not using log.Fatal (for some reason the panic isn't caught by the tests).
Merge branch 'master' into newui