Merge "Better return value checking"