Replace left-over debug prints with real error messages
Merge branch 'integration' of ssh://helios/home/git/repositories/honeyd into integration