Hot fix: Application is crushed if value is empty string