Fixes an exception caused by the implementation of TAP5-2358.