Partially reverts last commit that added first error message to exception without checking for presence of such.