cleanup
merge binary file silliness.
null check for location.