Same here...one thing I've noticed is that if location == null NPE exceptions get thrown.  We should probably check on null here.