fix errors with some parsing of empty data