Fix crush for null inputs at line 131