ensures we correctly handle nullptr return value

ensures we correctly handle nullptr return value #1496