fixed more run-time exceptions