change exception to warning for NaN values
Merge branch 'develop' into rate