added more improvements

Please add some meaningful text with some context as to where/why this exception was thrown, etc, as the error message logged in this particular line as well as all similar instances found within the rest of the changes introduced.