Remove unnecessary setup stuff and improve error reporting
Remove unnecessary setup stuff and improve error reporting

malensek/3RVX,Soulflare3/3RVX,malensek/3RVX,malensek/3RVX,Soulflare3/3RVX,Soulflare3/3RVX