fixed possible exception