change return type to be not null where known

change return type to be not null where known #1476