Fixing null processing, version 0.0.2