Added null-handling