Expand API
Prevent NullPointerExceptions