added a couple of line to prevent error