Merge "Added fallback for load failed"