Fixed an NPE in baseline checking
Don't override message when copying location info