Fixed an error message and wrapped excessive long lines