added exception handling for evolved feature evaluations
fixed merge