[MIE-670] - More refined error handling