Commits in qlom/qlom:error-handling-tomerge