added support for strong error handling before QA