merging updates from dimagi/better-error
updated submodule