Properly handle object return values!