Initial work on Put Failure handling