Fixed bad returned flag
Fixed invalid data copy from null vector