HEAD - More fixes for error cases
9 files changed