Fix for nonetype issues during parsing