removed extraneous "return None" and reflowed conditional per comments from I0e009fa4

Change-Id: I13e1e1b7a9fafaee04cf4714bb6f7e542666e672