Release 2.5.2 minor crash bugfix