minor changes. runtime exceptions introduced...