Fix for bad null pointer on flag by Toru Maesaka.