Improve Error Handling Messages

Added Correlation ID to message.