Fix error outputting
Cleanup
Add missing through dependency