Modified Error handling

Fixed issue that caused error "user is empty" to presist after data is
set.