Fix possible exception!