Fix NPE that was occurring when column value is null