Temporary check to avoid crashes