Bump to 2.5
Protect against a null pointer exception if setup() fails