Fix issue where post_query and pre_query are overwritten

This was causing a problem when you called the method twice in a row, you will receive the previous values - even if there should be an error.