Route minion errors to master

This was reverted earlier but this should contain fixes for those issues.