Fixed command exception issues, thanks zack :3