Tweaks to salt-ssh error handling

Running states through salt-ssh is currently broken. This does not fix that issue but gets us closer to the real problem...