Added error formatting configuration
Fixed pyflakes error on message processing
Merge conflicts