You can indeed apply for an extension. That said, we do recommend you get this resolved before coming to China. A visit to the Public Security Bureau will vary in luck depending on the officer in charge at that time.