Fixing properly empty & error cases.