BUG 2245 - Fix Unnecessary Local Before Return

Change-Id: I6fc4762d8af5cced96e82529cf23d75bb017dffa
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>