[#53] Add more specific error and add subject to test