Fix for java.lang.NullPointerException in LocationExtended