Added some robustness and non clobbering fall backs.