CE-6 Adding message for unexpected errors
CE-6 Fix for Notice undefined value
CE-6 Replacing deprecated messages usage