Missed out some error messages