(Minor null param. error msg improvement.)
Some fixes for the classic_compatible mode, tanks to Information Mosaic.