Added nullcheck for safety^^