Added some additional error and display messages for list