Added call to resolve a non-existent message and its implications