Implemented additional checks to prevent SQL failures during processing of bad... See merge request !424