Remerging with forgotten commit.
Adding filename to error message.