OPAL-2451: Clear errors
Merge pull request #544 from emorency/OPAL-2451-error-messages

OPAL-2451: Clear errors