I will merge that first to fix the master problem. Then adding comments or modifications for Hsql error essage cases.