Update to marquise 3.1.0 error handling logic

Per https://github.com/anchor/marquise/blob/master/RELEASE.md#310