Added graceful handling of constants