branch: segfault fixes and validation