working on more graceful error handling