Merge "Add param null-check + error return"