Address issue #76 - more return parameter checking