Drop an empty header

Change-Id: I34904af6da8f37459ef96071caa53230ad02a8e7
Avoid possible memory leaks in case of exceptions

Change-Id: I46d49b515f5212a34612e80a82a3330a041b956c