Cleanup, added error handling messages