Better error handling
Better error handling

original commit: vintage-software/vstack@59decc4bb273463db1077ae8e1ac8d4dd56aa012

split from ce34e3f3b0a47fc82dd08eac56048bb678fe9a16

vintage-software/vstack