Removed the @error lines to fix the Error handling.  Also added a shortcut in common.py for None datatypes.