Added more warp loading checks to prevent errors

Added more warp loading checks to prevent errors