Bug fix : NullPointerException on location