BUG-869: remove unneeded null check