added an exception and replaced hard-coded comment with var