CR fix: adding RuntimeException throw