Small style change
Better error reporting