Rearranged outbound to return early on error