Returning null instead of erroring.
Committing build.