Cleanup Error Handling in a more methodical way for Tornjak. Return, handle and propagate errors instead of returning silently in some cases.