More error message tweaking.
Merge remote-tracking branch 'origin/master' into beanstalk-logs

Conflicts:
	lib/router.js