[Fixed] minor gubbur attacks - mantis 4318

Change-Id: I8e2f8d5fcf46fff73d98c03eb00011ae68ec65ea