Added null handling when Map Paths haven't been initialized