Right you are. Restore, and test, null input handling.