TxLib: Added argument null checks