Fix TypeError: Cannot read property '1' of null