Fixed annoying error + new lines after something self-destructed on me again...