Return errors on gateway timeout

@EamonNerbonne