See previous commit.
Added error msg for possible error.