Add error handling in MerchantController for queries#782

StuartFerguson merged 1 commit intomasterTransactionProcessing/TransactionProcessor:masterfrom

bug/#768_merchant_with_no_contracts_handled_betterTransactionProcessing/TransactionProcessor:bug/#768_merchant_with_no_contracts_handled_betterCopy head branch name to clipboard