Stop hardcoding version here (comes from properties)

Also a touch of whitespace cleanup.
Throw more specific exception message