WrongHeaderException added
some small changes