Reverted fix for issue #574 back to original solution without GetInterfaceImplementation() + added unit test for error case.