API update
Fix potential NPE (flagged by IDE)
Remove whitespace to satisfy style checker.