minor, hygiene, propagate errors in shaf() through to main

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Merge branch 'tool/shack'

* tool/shack:
  minor, hygiene, propagate errors in shaf() through to main