Broken commit with a segfault.
Segfault fix.