Adds null check
Repacks binaries