Handle exceptions described in AMQ-5372 to avoid cascading test failures
Updated to no longer use deprecated junit.framework.Assert