Fixes for issue with nulls during parsing

Fixes issues where some values could be null in failure case