Fixes data === null error