Add run_mode workaround & sanity

Prior to this commit we did not pass the catalog error along
This commit changes this and upates the run_mode to master for
older versions of puppet