fixed crashing with no location