Fixed error message processing
Changed import rule
Updated Changes file