Small performance improvement / minor bugfix

The only place where it's used is checked for nullity.
Also, it's possible, also difficult, to match a different
recapitalize with the old code, triggering a bug that
this fixes.

Change-Id: I717d6df489025c75d1caca290a9086c3b39a9306