Remove noisy exception, add comments

Conflicts:
	h/js/services.coffee
Add protection against null annotations in addEmphasis and removeEmphasis