BIGTOP-1125. Return value does not reflect status checks