Issue#24 - Return code from remote check not properly handled