Don't use default deck when deck override set to invalid deck

I stumbled upon this 10 years old PR. If it wasn’t intentionally reverted, it’d be great to have it back!