Added better error handling in Correlation generator. UI Fixes.