Small changes for runtime exceptions