add missing null pointer check on output/input getter
Merge branch 'develop'