Added proper error message for commercial products via update server
Some cleanup