Fixed potential nil data crash