Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop