More consistent in exceptions. Remove spare lines.