Must check if position is null
Looots of code fixes based on PhpStorm code inspection
Dropped useless version constant
Merge branch 'hotfix/4.3.1'