1) Added more error catching and messaging on sample app