Merge "Check for error before outputting srcset urls"