Fixed: swallowed exception

Change-Id: I9018cb7b9d97f47fc9ccb33589f17cf758fd2af9